merge from debian branch

diff --git a/debian/changelog b/debian/changelog
index 4d936b8..3a77d70 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+userdir-ldap (0.3.23) unstable; urgency=low
+
+  * Fix generation of known_hosts file.
+
+ -- Peter Palfrader <weasel@debian.org>  Wed, 14 May 2008 17:55:45 +0200
+
+userdir-ldap (0.3.22) unstable; urgency=low
+
+  * Add VoIP fiels to the LDAP shema and teach ud-info and ud-mailgate
+    about it. [zobel]
+  * Add IPv6-Adresses (and IPv4 in v6 notation - ::ffff:192.0.2.1) to
+    ssh_known_hosts. [aba]
+  * ud-mailgate no longer accepts ssh dss keys, keys with a size smaller
+    than 1024.  Additionally it checks new keys against a blacklist of
+    ssh key fingerprints. [joerg]
+
+ -- Peter Palfrader <weasel@debian.org>  Wed, 14 May 2008 17:47:45 +0200
+
 userdir-ldap (0.3.21) unstable; urgency=low
 
   * ud-replicate: use the host key to sync stuff from the db server,

diff --git a/ud-generate b/ud-generate
index a0dc9a4..6870ed9 100755 (executable)
--- a/ud-generate
+++ b/ud-generate
@@ -765,7 +765,7 @@ def GenSSHKnown(l,File):
         else: IPAdresses += [addr[1]]
 
       for I in x[1]["sshRSAHostKey"]:
-         Line = "%s,%s %s" %(",".join(HostNames + IPAdresses), I);
+         Line = "%s %s" %(",".join(HostNames + IPAdresses), I);
          Line = Sanitize(Line) + "\n";
          F.write(Line);
   # Oops, something unspeakable happened.