Use the common routine from userdir_ldap.py which asks for the

[mirror/userdir-ldap.git] / ud-mailgate

diff --git a/ud-mailgate b/ud-mailgate
index fa4cf86..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();
- 
+
    attrName = G[0].lower();
    for i in DelItems.keys():
       if i.lower() == attrName:
@@ -268,6 +268,9 @@ def HandleChange(Reply,DnRecord,Key):
 
    # 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);
 
@@ -399,7 +402,6 @@ try:
    Rply = RC.Check(Res[1]);
    if Rply != None:
       raise Error, Rply;
-   RC.Add(Res[1]);
 
    # Connect to the ldap server
    ErrType = EX_TEMPFAIL;
@@ -410,13 +412,16 @@ try:
 
    # 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.."
 
+   RC.Add(Res[1]);
+
    # 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:
@@ -424,9 +429,6 @@ try:
    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);