ud-replicate: Also support the imposter dchroot-dsa from the debian archive [aba]

diff --git a/debian/changelog b/debian/changelog
index 7e241b5..8c2ebfe 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
-userdir-ldap (0.3.24) UNRELEASED; urgency=low
+userdir-ldap (0.3.XX) Xnstable; urgency=low
 
-  * Add compatibility to dchroot-dsa to ud-replicate.
+  * 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]
 
- -- Andreas Barth <aba@alioth.debian.org>  Fri, 16 May 2008 17:32:37 +0000
+ -- Peter Palfrader <weasel@debian.org>  Sat, 17 May 2008 11:20:06 +0200
 
 userdir-ldap (0.3.23) unstable; urgency=low
 

diff --git a/ud-mailgate b/ud-mailgate
index b158ba8..4da4382 100755 (executable)
--- 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 (executable)
--- 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