From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 17 May 2008 09:30:38 +0000 (+0200)
Subject: merge from alioth: aba: add myself to copyright holders
X-Git-Tag: userdir-ldap-0.3.24~6
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap.git;a=commitdiff_plain;h=67e8c86da4c2f6aa971ec7b6d906f9d297e61d70;hp=232afb796106134ce24480ed07d765b67e20847a

merge from alioth: aba: add myself to copyright holders
---

diff --git a/debian/changelog b/debian/changelog
index 120e41b..3c46d61 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,17 @@
-userdir-ldap (0.3.24) UNRELEASED; urgency=low
-
-  * Add compatibility to dchroot-dsa to ud-replicate.
-  * Add (disabled) generation of authorized_keys suiteable for sshdist.
-  * Add performance optimization by caching IP adresses in ud-generate
-    (as a precondition for automatically adding aliases)
-
- -- Andreas Barth <aba@not.so.argh.org>  Fri, 16 May 2008 17:35:19 +0000
+userdir-ldap (0.3.XX) Xnstable; urgency=low
+
+  * ud-mailgate: better regex for ssh1 keys, which we reject. [joerg, weasel]
+  * ud-replicate: Also support the imposter dchroot-dsa from the debian
+    archive. [aba, weasel]
+  * ud-generate: Add support for generation of authorized_keys file on
+    the db host for the sshdist user.  This is now possible since
+    ud-replicate clients use their ssh host key to authenticate to the
+    db server.  The code now supports this but the feature is still
+    disabled. [aba]
+  * ud-generate: Add performance optimization by resolving IP adresses
+    for hosts only once and caching the result. [aba]
+
+ -- Peter Palfrader <weasel@debian.org>  Sat, 17 May 2008 11:29:41 +0200
 
 userdir-ldap (0.3.23) unstable; urgency=low
 
diff --git a/ud-mailgate b/ud-mailgate
index b158ba8..4da4382 100755
--- a/ud-mailgate
+++ b/ud-mailgate
@@ -30,7 +30,7 @@ SeenList = {}
 DNS = {}
 
 SSHFingerprint = re.compile('^(\d+) ([0-9a-f\:]{47}) (.+)$')
-SSHRSA1Match = re.compile('^\d+ (\d+) \d+ .*')
+SSHRSA1Match = re.compile('^^(.* )?\d+ \d+ \d+')
 
 ArbChanges = {"c": "..",
 	      "l": ".*",
@@ -242,7 +242,7 @@ def DoSSH(Str, Attrs, badkeys, uid):
    g = Match.groups()
    typekey = g[1]
    if Match == None:
-      Match =SSHRSA1Match.match(Str)
+      Match = SSHRSA1Match.match(Str)
       if Match is not None:
          return "RSA1 keys not supported anymore"
       return None;
diff --git a/ud-replicate b/ud-replicate
index d7137cd..b745119 100755
--- a/ud-replicate
+++ b/ud-replicate
@@ -68,11 +68,11 @@ done
 ln -sf `pwd -P`/ssh-rsa-shadow /etc/ssh
 ln -sf `pwd -P`/ssh_known_hosts /etc/ssh
 
+CHROOTS=""
 if [ -x /usr/bin/dchroot ]; then
 	CHROOTS=`dchroot --listpaths`
-fi
-if [ -x /usr/bin/dchroot-dsa ]; then
-        CHROOTS=$(dchroot-dsa -i | grep Location | awk '{print $2}')
+elif [ -x /usr/bin/dchroot-dsa ]; then
+	CHROOTS=$(dchroot-dsa -i | grep Location | awk '{print $2}')
 fi
 if [ -n "$CHROOTS" ]; then
 	for c in $CHROOTS; do