[Da-tools-commits] ./da-tools/userdir-ldap-sshkeys r389: merge from debian branch

[Mark Hymers]

------------------------------------------------------------
revno: 389
committer: Mark Hymers <mhy at debian.org>
branch nick: userdir-ldap-sshkeys
timestamp: Wed 2008-05-14 20:37:13 +0100
message:
  merge from debian branch
modified:
  debian/changelog
  ud-generate
    ------------------------------------------------------------
    revno: 349.5.1
    committer: Peter Palfrader <peter at palfrader.org>
    branch nick: userdir-ldap
    timestamp: Wed 2008-05-14 17:29:25 +0200
    message:
      Merge: Add another todo item
    modified:
      TODO
    ------------------------------------------------------------
    revno: 349.5.2
    committer: Peter Palfrader <peter at palfrader.org>
    branch nick: userdir-ldap
    timestamp: Wed 2008-05-14 17:32:49 +0200
    message:
      Add VoIP fiels to the LDAP shema and teach ud-info and ud-mailgate about it. [zobel]
    modified:
      debian/changelog
      ud-info
      ud-mailgate
      userdir-ldap.schema
    ------------------------------------------------------------
    revno: 349.5.3
    committer: Peter Palfrader <peter at palfrader.org>
    branch nick: userdir-ldap
    timestamp: Wed 2008-05-14 17:37:21 +0200
    message:
      Add IPv6-Adresses (and IPv4 in v6 notation - ::ffff:192.0.2.1) to ssh_known_hosts. [aba]
    modified:
      debian/changelog
      ud-generate
    ------------------------------------------------------------
    revno: 349.5.4
    committer: Peter Palfrader <peter at palfrader.org>
    branch nick: userdir-ldap
    timestamp: Wed 2008-05-14 17:47:17 +0200
    message:
      Merge: 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]
    added:
      templates/admin-info
    modified:
      debian/changelog
      ud-mailgate
      userdir-ldap.conf
    ------------------------------------------------------------
    revno: 349.5.5
    committer: Peter Palfrader <peter at palfrader.org>
    branch nick: userdir-ldap
    timestamp: Wed 2008-05-14 17:48:00 +0200
    message:
      0.3.22
    modified:
      debian/changelog
    ------------------------------------------------------------
    revno: 349.5.6
    committer: Peter Palfrader <peter at palfrader.org>
    branch nick: userdir-ldap
    timestamp: Wed 2008-05-14 17:56:01 +0200
    message:
      Fix generation of known_hosts file.
    modified:
      debian/changelog
      ud-generate
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2008-05-13 20:09:02 +0000
+++ b/debian/changelog	2008-05-14 15:56:01 +0000
@@ -1,3 +1,21 @@
+userdir-ldap (0.3.23) unstable; urgency=low
+
+  * Fix generation of known_hosts file.
+
+ -- Peter Palfrader <weasel at 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 at 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,

=== modified file 'ud-generate'
--- a/ud-generate	2008-05-14 18:55:18 +0000
+++ b/ud-generate	2008-05-14 19:37:13 +0000
@@ -765,7 +765,7 @@
 	 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.