We would previously ignore purpose hosts for ssh known hosts purposes if the

service name would not start the purpose field.  Fix this.

diff --git a/debian/changelog b/debian/changelog
index ea98b67..ca60ec1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+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:
 userdir-ldap (0.3.65) unstable; urgency=low
 
   * userdir-ldap.conf: remove from default keyrings:

diff --git a/ud-generate b/ud-generate
index de97265..b4ae223 100755 (executable)
--- a/ud-generate
+++ b/ud-generate
@@ -42,7 +42,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);
 
 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(":")
 
 DNSZone = ".debian.net"
 Keyrings = ConfModule.sync_keyrings.split(":")