projects
/
mirror
/
userdir-ldap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't let Python abort unconditionally if a host wasn't found.
[mirror/userdir-ldap.git]
/
ud-mailgate
diff --git
a/ud-mailgate
b/ud-mailgate
index
fa4cf86
..
7c62c88
100755
(executable)
--- a/
ud-mailgate
+++ b/
ud-mailgate
@@
-30,7
+30,7
@@
ArbChanges = {"c": "..",
"ircNick": ".*",
"icqUin": "^[0-9]*$",
"onVacation": ".*",
"ircNick": ".*",
"icqUin": "^[0-9]*$",
"onVacation": ".*",
- "labledURI": ".*"};
+ "lab
e
ledURI": ".*"};
DelItems = {"c": None,
"l": None,
DelItems = {"c": None,
"l": None,
@@
-41,10
+41,11
@@
DelItems = {"c": None,
"emailForward": None,
"ircNick": None,
"onVacation": None,
"emailForward": None,
"ircNick": None,
"onVacation": None,
- "labledURI": None,
+ "lab
e
ledURI": None,
"latitude": None,
"longitude": None,
"icqUin": None,
"latitude": None,
"longitude": None,
"icqUin": None,
+ "dnsZoneEntry": None,
"sshRSAAuthKey": None,
"sshDSAAuthKey": None};
"sshRSAAuthKey": None,
"sshDSAAuthKey": None};
@@
-136,7
+137,7
@@
def DoDel(Str,Attrs):
if Match == None:
return None;
G = Match.groups();
if Match == None:
return None;
G = Match.groups();
-
+
attrName = G[0].lower();
for i in DelItems.keys():
if i.lower() == attrName:
attrName = G[0].lower();
for i in DelItems.keys():
if i.lower() == attrName:
@@
-173,6
+174,9
@@
def DoPosition(Str,Attrs):
def DoSSH(Str,Attrs):
Match = SSH2AuthSplit.match(Str);
if Match == None:
def DoSSH(Str,Attrs):
Match = SSH2AuthSplit.match(Str);
if Match == None:
+ Match = re.compile('^1024 (\d+) ').match(Str)
+ if Match is not None:
+ return "SSH1 keys not supported anymore"
return None;
global SeenKey;
return None;
global SeenKey;
@@
-268,6
+272,9
@@
def HandleChange(Reply,DnRecord,Key):
# Modify the record
l.simple_bind_s("uid="+AccessPass[0]+","+BaseDn,AccessPass[1]);
# Modify the record
l.simple_bind_s("uid="+AccessPass[0]+","+BaseDn,AccessPass[1]);
+ oldAttrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,"uid="+GetAttr(DnRecord,"uid"));
+ if (string.find(GetAttr(oldAttrs[0],"userPassword"),"*LK*") != -1):
+ raise Error, "This account is locked";
Dn = "uid=" + GetAttr(DnRecord,"uid") + "," + BaseDn;
l.modify_s(Dn,Attrs);
Dn = "uid=" + GetAttr(DnRecord,"uid") + "," + BaseDn;
l.modify_s(Dn,Attrs);
@@
-399,7
+406,6
@@
try:
Rply = RC.Check(Res[1]);
if Rply != None:
raise Error, Rply;
Rply = RC.Check(Res[1]);
if Rply != None:
raise Error, Rply;
- RC.Add(Res[1]);
# Connect to the ldap server
ErrType = EX_TEMPFAIL;
# Connect to the ldap server
ErrType = EX_TEMPFAIL;
@@
-410,13
+416,16
@@
try:
# Search for the matching key fingerprint
Attrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,"keyFingerPrint=" + Res[2][1]);
# Search for the matching key fingerprint
Attrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,"keyFingerPrint=" + Res[2][1]);
+
+ ErrType = EX_PERMFAIL;
if len(Attrs) == 0:
raise Error, "Key not found"
if len(Attrs) != 1:
raise Error, "Oddly your key fingerprint is assigned to more than one account.."
if len(Attrs) == 0:
raise Error, "Key not found"
if len(Attrs) != 1:
raise Error, "Oddly your key fingerprint is assigned to more than one account.."
+ RC.Add(Res[1]);
+
# Determine the sender address
# Determine the sender address
- ErrType = EX_PERMFAIL;
ErrMsg = "A problem occured while trying to formulate the reply";
Sender = Email.getheader("Reply-To");
if Sender == None:
ErrMsg = "A problem occured while trying to formulate the reply";
Sender = Email.getheader("Reply-To");
if Sender == None:
@@
-424,9
+433,6
@@
try:
if Sender == None:
raise Error, "Unable to determine the sender's address";
if Sender == None:
raise Error, "Unable to determine the sender's address";
- if (string.find(GetAttr(Attrs[0],"userPassword"),"*LK*") != -1):
- raise Error, "This account is locked";
-
# Formulate a reply
Date = time.strftime("%a, %d %b %Y %H:%M:%S +0000",time.gmtime(time.time()));
Reply = "To: %s\nReply-To: %s\nDate: %s\n" % (Sender,ReplyTo,Date);
# Formulate a reply
Date = time.strftime("%a, %d %b %Y %H:%M:%S +0000",time.gmtime(time.time()));
Reply = "To: %s\nReply-To: %s\nDate: %s\n" % (Sender,ReplyTo,Date);