X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap.git;a=blobdiff_plain;f=ud-mailgate;h=b158ba885b813fd548f8b09694075cbf7f8ed259;hp=51942f14289416fec8ad28c423cfc39522ca47b4;hb=0050d73a0bc648610b072c3a82a7bae0241d869c;hpb=983bd4b4e1ad50b3f68d042e0a90d9ab4efc4b6e diff --git a/ud-mailgate b/ud-mailgate index 51942f1..b158ba8 100755 --- a/ud-mailgate +++ b/ud-mailgate @@ -30,6 +30,7 @@ SeenList = {} DNS = {} SSHFingerprint = re.compile('^(\d+) ([0-9a-f\:]{47}) (.+)$') +SSHRSA1Match = re.compile('^\d+ (\d+) \d+ .*') ArbChanges = {"c": "..", "l": ".*", @@ -241,9 +242,9 @@ def DoSSH(Str, Attrs, badkeys, uid): 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")