Merge changes back in

diff --git a/debian/changelog b/debian/changelog
index 3de75b7..469cbf7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-userdir-ldap (0.3.66) unstable; urgency=low
+userdir-ldap (0.3.66+XX) unstable; urgency=low
 
+  * ud-replicate no longer uses localsyncon=*samosa*.
   * ud-generate cleanup:
     - general code tidy (whitespace, semi-colons, python idioms)
     - loop cleanup, so that fewer redundant checks are done
@@ -10,6 +11,13 @@ userdir-ldap (0.3.66) unstable; urgency=low
 
  -- Stephen Gran <sgran@debian.org>  Sat, 09 May 2009 16:41:36 +0100
 
+userdir-ldap (0.3.66) unstable; urgency=low
+
+  * We would previously ignore purpose hosts for ssh known hosts purposes
+    if the service name would not start the purpose field.  Fix this.
+
+ -- Peter Palfrader <weasel@debian.org>  Fri, 01 May 2009 17:10:05 +0200
+
 userdir-ldap (0.3.65) unstable; urgency=low
 
   * userdir-ldap.conf: remove from default keyrings:

diff --git a/ud-generate b/ud-generate
index 4e627e8..18e4c6e 100755 (executable)
--- a/ud-generate
+++ b/ud-generate
@@ -46,7 +46,7 @@ UUID_FORMAT = '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'
 
 EmailCheck = re.compile("^([^ <>@]+@[^ ,<>@]+)?$")
 BSMTPCheck = re.compile(".*mx 0 (gluck)\.debian\.org\..*",re.DOTALL)
-PurposeHostField = re.compile(r"\[\[([\*\-]?[a-z0-9.\-]*)(?:\|.*)?\]\]")
+PurposeHostField = re.compile(r".*\[\[([\*\-]?[a-z0-9.\-]*)(?:\|.*)?\]\]")
 DNSZone = ".debian.net"
 Keyrings = ConfModule.sync_keyrings.split(":")
 

diff --git a/userdir-ldap.conf b/userdir-ldap.conf
index 3ace1f0..f262529 100644 (file)
--- a/userdir-ldap.conf
+++ b/userdir-ldap.conf
@@ -4,7 +4,7 @@
 # host from which to rsync the information (the one running ud-generate)
 synchost = "db";
 # hosts on which to use a local path to get the data (used as a shell glob later)
-localsyncon = "*samosa*";
+localsyncon = "*notanymoretheoldbdhostsamosasamosa*";
 
 # Basic LDAP configuration
 ldaphost = "db.debian.org";