X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-mailgate;h=4e3b39dff3e3925b4f13b63072deb1109d698004;hb=589b5169cd37cf46848163806564963890d7f45e;hp=6e94c75fadba29cc2f2826af9499871902cdfda0;hpb=2525bf73603cb6487cfcea096e2dc347ad360394;p=mirror%2Fuserdir-ldap.git

diff --git a/ud-mailgate b/ud-mailgate
index 6e94c75..4e3b39d 100755
--- a/ud-mailgate
+++ b/ud-mailgate
@@ -27,6 +27,7 @@ ArbChanges = {"c": "..",
               "loginshell": ".*",
               "emailforward": "^([^<>@]+@.+)?$",
               "ircnick": ".*",
+              "icquin": "^[0-9]*$",
               "onvacation": ".*",
               "labeledurl": ".*"};
 
@@ -42,6 +43,7 @@ DelItems = {"c": None,
             "labeledurl": None,
 	    "latitude": None,
 	    "longitude": None,
+            "icquin": None,
 	    "sshrsaauthkey": None};
 
 # Decode a GPS location from some common forms
@@ -308,7 +310,7 @@ def HandleChPass(Reply,DnRecord,Key):
 
    # Check for a locked account
    Attrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,"uid="+GetAttr(DnRecord,"uid"));
-   if (string.find(GetAttr(Attrs[0],"userPassword"),"*LK*")  != -1):
+   if (string.find(GetAttr(Attrs[0],"userpassword"),"*LK*")  != -1):
       raise Error, "This account is locked";
 
    # Modify the password
@@ -395,7 +397,7 @@ try:
    if Sender == None:
       raise Error, "Unable to determine the sender's address";
 
-   if (string.find(GetAttr(Attrs[0],"userPassword"),"*LK*")  != -1):
+   if (string.find(GetAttr(Attrs[0],"userpassword"),"*LK*")  != -1):
       raise Error, "This account is locked";
 
    # Formulate a reply