projects
/
mirror
/
userdir-ldap.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c6294c9
)
Update from samosa: Misc changes
author
joey
<>
Sat, 6 Nov 2004 15:22:22 +0000
(15:22 +0000)
committer
joey
<>
Sat, 6 Nov 2004 15:22:22 +0000
(15:22 +0000)
ud-mailgate
patch
|
blob
|
history
diff --git
a/ud-mailgate
b/ud-mailgate
index
18cebfb
..
bea4372
100755
(executable)
--- a/
ud-mailgate
+++ b/
ud-mailgate
@@
-136,7
+136,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:
@@
-402,7
+402,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
+412,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: