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

diff --git a/ud-mailgate b/ud-mailgate
index 586dddb..6e94c75 100755
--- a/ud-mailgate
+++ b/ud-mailgate
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- mode: python -*-
-import userdir_gpg, userdir_ldap, sys, traceback, time, ldap, posix;
+import userdir_gpg, userdir_ldap, sys, traceback, time, ldap, os;
 import string, pwd
 from userdir_gpg import *;
 from userdir_ldap import *;
@@ -234,7 +234,7 @@ def HandleChange(Reply,DnRecord,Key):
 
    # Connect to the ldap server
    l = ldap.open(LDAPServer);
-   F = open(PassDir+"/pass-"+pwd.getpwuid(posix.getuid())[0],"r");
+   F = open(PassDir+"/pass-"+pwd.getpwuid(os.getuid())[0],"r");
    AccessPass = string.split(string.strip(F.readline())," ");
    F.close();
 
@@ -301,12 +301,17 @@ def HandleChPass(Reply,DnRecord,Key):
    
    # Connect to the ldap server
    l = ldap.open(LDAPServer);
-   F = open(PassDir+"/pass-"+pwd.getpwuid(posix.getuid())[0],"r");
+   F = open(PassDir+"/pass-"+pwd.getpwuid(os.getuid())[0],"r");
    AccessPass = string.split(string.strip(F.readline())," ");
    F.close();
+   l.simple_bind_s("uid="+AccessPass[0]+","+BaseDn,AccessPass[1]);
+
+   # 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):
+      raise Error, "This account is locked";
 
    # Modify the password
-   l.simple_bind_s("uid="+AccessPass[0]+","+BaseDn,AccessPass[1]);
    Rec = [(ldap.MOD_REPLACE,"userPassword","{crypt}"+Pass)];
    Dn = "uid=" + GetAttr(DnRecord,"uid") + "," + BaseDn;
    l.modify_s(Dn,Rec);
@@ -316,7 +321,7 @@ def HandleChPass(Reply,DnRecord,Key):
 # Start of main program
 
 # Drop messages from a mailer daemon.
-if posix.environ.has_key('SENDER') == 0 or len(posix.environ['SENDER']) == 0:
+if os.environ.has_key('SENDER') == 0 or len(os.environ['SENDER']) == 0:
    sys.exit(0);
 
 ErrMsg = "Indeterminate Error";
@@ -412,8 +417,8 @@ try:
 
    # Send the message through sendmail      
    ErrMsg = "A problem occured while trying to send the reply";
-   Child = posix.popen("/usr/sbin/sendmail -t","w");
-#   Child = posix.popen("cat","w");
+   Child = os.popen("/usr/sbin/sendmail -t","w");
+#   Child = os.popen("cat","w");
    Child.write(Reply);
    if Child.close() != None:
       raise Error, "Sendmail gave a non-zero return code";
@@ -421,7 +426,7 @@ try:
 except:
    # Error Reply Header
    Date = time.strftime("%a, %d %b %Y %H:%M:%S +0000",time.gmtime(time.time()));
-   ErrReplyHead = "To: %s\nReply-To: %s\nDate: %s\n" % (posix.environ['SENDER'],ReplyTo,Date);
+   ErrReplyHead = "To: %s\nReply-To: %s\nDate: %s\n" % (os.environ['SENDER'],ReplyTo,Date);
 
    # Error Body
    Subst = {};
@@ -441,7 +446,7 @@ except:
    try:
       ErrReply = TemplateSubst(Subst,open(TemplatesDir+"error-reply","r").read());
 
-      Child = posix.popen("/usr/sbin/sendmail -t","w");
+      Child = os.popen("/usr/sbin/sendmail -t","w");
       Child.write(ErrReplyHead);
       Child.write(ErrReply);
       if Child.close() != None: