projects
/
mirror
/
userdir-ldap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from zobel: Fix userdir-ldap.schema (objectClass now contains MAY: VoIP)
[mirror/userdir-ldap.git]
/
ud-mailgate
diff --git
a/ud-mailgate
b/ud-mailgate
index
b158ba8
..
69707f8
100755
(executable)
--- a/
ud-mailgate
+++ b/
ud-mailgate
@@
-30,7
+30,7
@@
SeenList = {}
DNS = {}
SSHFingerprint = re.compile('^(\d+) ([0-9a-f\:]{47}) (.+)$')
DNS = {}
SSHFingerprint = re.compile('^(\d+) ([0-9a-f\:]{47}) (.+)$')
-SSHRSA1Match = re.compile('^
\d+ (\d+) \d+ .*
')
+SSHRSA1Match = re.compile('^
^(.* )?\d+ \d+ \d+
')
ArbChanges = {"c": "..",
"l": ".*",
ArbChanges = {"c": "..",
"l": ".*",
@@
-239,10
+239,12
@@
def LoadBadSSH():
# [options] 1024 35 13188913666680[..] [comment]
def DoSSH(Str, Attrs, badkeys, uid):
Match = SSH2AuthSplit.match(Str);
# [options] 1024 35 13188913666680[..] [comment]
def DoSSH(Str, Attrs, badkeys, uid):
Match = SSH2AuthSplit.match(Str);
+ if Match == None:
+ return None;
g = Match.groups()
typekey = g[1]
if Match == None:
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;
if Match is not None:
return "RSA1 keys not supported anymore"
return None;