[Da-tools-commits] ./da-tools/userdir-ldap-sshkeys r397: Merge from -common branch

[Joerg Jaspert]

------------------------------------------------------------
revno: 397
committer: Joerg Jaspert <joerg at debian.org>
branch nick: userdir-ldap-sshkeys
timestamp: Fri 2008-05-16 20:56:53 +0200
message:
  Merge from -common branch
modified:
  ud-mailgate
    ------------------------------------------------------------
    revno: 387.1.1
    committer: Joerg Jaspert <joerg at debian.org>
    branch nick: userdir-ldap-common
    timestamp: Thu 2008-05-15 01:02:17 +0200
    message:
      Merge from Debian
    modified:
      debian/changelog
      ud-generate
    ------------------------------------------------------------
    revno: 387.1.2
    committer: Joerg Jaspert <joerg at debian.org>
    branch nick: userdir-ldap-common
    timestamp: Thu 2008-05-15 23:35:13 +0200
    message:
      Modify the SSH1 key check so it matches all RSA1 keys, not only those of size 1024
    modified:
      ud-mailgate
-------------- next part --------------
=== modified file 'ud-mailgate'
--- a/ud-mailgate	2008-05-14 14:56:04 +0000
+++ b/ud-mailgate	2008-05-15 21:35:13 +0000
@@ -30,6 +30,7 @@
 DNS = {}
 
 SSHFingerprint = re.compile('^(\d+) ([0-9a-f\:]{47}) (.+)$')
+SSHRSA1Match = re.compile('^\d+ (\d+) \d+ .*')
 
 ArbChanges = {"c": "..",
 	      "l": ".*",
@@ -241,9 +242,9 @@
    g = Match.groups()
    typekey = g[1]
    if Match == None:
-      Match = re.compile('^1024 (\d+) ').match(Str)
+      Match =SSHRSA1Match.match(Str)
       if Match is not None:
-         return "SSH1 keys not supported anymore"
+         return "RSA1 keys not supported anymore"
       return None;
 
    (fd, path) = tempfile.mkstemp(".pub", "sshkeytry", "/tmp")