ud-generate: Declare [UNTRSUTED] flag as obsolete.

ud-generate: Add [NOMARKERS] flag to not push markers (gps coordinates) to host.

diff --git a/debian/changelog b/debian/changelog
index 7d48a72..1603478 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+userdir-ldap (0.3.45) unstable; urgency=low
+
+  * ud-generate: Declare [UNTRSUTED] flag as obsolete.
+  * ud-generate: Add [NOMARKERS] flag to not push markers (gps coordinates) to host.
+
+ -- Peter Palfrader <weasel@debian.org>  Thu, 23 Oct 2008 20:25:09 +0200
+
 userdir-ldap (0.3.44) unstable; urgency=low
 
   * ud-mailgate: Do not support del requests for sshDSAAuthKey - there is no

diff --git a/ud-generate b/ud-generate
index deaf8c0..5515b98 100755 (executable)
--- a/ud-generate
+++ b/ud-generate
@@ -1060,12 +1060,14 @@ while(1):
                 os.path.join(OutDir, 'ssh-keys.tar.gz'))
 
    if ExtraList.has_key("[UNTRUSTED]"):
+     print "[UNTRUSTED] tag is obsolete and may be removed in the future."
      continue;
    if not ExtraList.has_key("[NOPASSWD]"):
      GenShadow(l,OutDir+"shadow");
 
    # Link in global things
-   DoLink(GlobalDir,OutDir,"markers");
+   if not ExtraList.has_key("[NOMARKERS]"):
+     DoLink(GlobalDir,OutDir,"markers");
    DoLink(GlobalDir,OutDir,"mail-forward.cdb");
    DoLink(GlobalDir,OutDir,"mail-disable");
    DoLink(GlobalDir,OutDir,"mail-greylist");