projects
/
mirror
/
userdir-ldap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added ud-roleadd for adding role accounts to LDAP
[mirror/userdir-ldap.git]
/
ud-mailgate
diff --git
a/ud-mailgate
b/ud-mailgate
index
18cebfb
..
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;
@@
-402,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;
@@
-413,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: