From: Peter Palfrader <peter@palfrader.org>
Date: Thu, 22 May 2008 19:39:18 +0000 (+0200)
Subject: Do not disable mail just because the account is locked.
X-Git-Tag: userdir-ldap-0.3.28
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap.git;a=commitdiff_plain;h=05568ae0eb4d02e72b8c5df4f4881ec871abfa24

Do not disable mail just because the account is locked.
---

diff --git a/debian/changelog b/debian/changelog
index 4356b01..5c1b602 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+userdir-ldap (0.3.28) unstable; urgency=low
+
+  * Do not disable mail just because the account is locked.
+
+ -- Peter Palfrader <weasel@debian.org>  Thu, 22 May 2008 21:38:56 +0200
+
 userdir-ldap (0.3.27) unstable; urgency=low
 
   * Export ssh-keys.tar.gz to [UNTRUSTED] hosts.  Since we already export
diff --git a/ud-generate b/ud-generate
index b331c31..773b746 100755
--- a/ud-generate
+++ b/ud-generate
@@ -516,18 +516,11 @@ def GenMailDisable(l,File):
 
    for x in PasswdAttrs:
       Reason = None
-      
-      # If the account is locked, disable incoming mail
-      if (GetAttr(x,"userPassword").find("*LK*") != -1):
-         if GetAttr(x,"uid") == "luther":
-	    continue
-	 else:
-            Reason = "user account locked"
+
+      if x[1].has_key("mailDisableMessage"):
+         Reason = GetAttr(x,"mailDisableMessage")
       else:
-         if x[1].has_key("mailDisableMessage"):
-            Reason = GetAttr(x,"mailDisableMessage")
-         else:
-            continue
+         continue
 
       # Must be in the Debian group (yuk, hard coded for now)
       if GetAttr(x,"gidNumber") != "800":