[Da-tools-commits] ./debian/userdir-ldap r414: Do not disable mail just because the account is locked.

[Peter Palfrader]

------------------------------------------------------------
revno: 414
committer: Peter Palfrader <peter at palfrader.org>
branch nick: userdir-ldap
timestamp: Thu 2008-05-22 21:39:18 +0200
message:
  Do not disable mail just because the account is locked.
modified:
  debian/changelog
  ud-generate
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2008-05-19 06:56:21 +0000
+++ b/debian/changelog	2008-05-22 19:39:18 +0000
@@ -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 at 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

=== modified file 'ud-generate'
--- a/ud-generate	2008-05-19 06:56:21 +0000
+++ b/ud-generate	2008-05-22 19:39:18 +0000
@@ -516,18 +516,11 @@
 
    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":