Properly show shadowlastchange and mail disabled message when locking an

account, but not disabling email.  It was written to ldap correctly, but we
updated the data to display wrongly.

diff --git a/debian/changelog b/debian/changelog
index 0f687c3..8d24a2e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+userdir-ldap (0.3.XX) unstable; urgency=low
+
+  * Properly show shadowlastchange and mail disabled message when
+    locking an account, but not disabling email.  It was written to
+    ldap correctly, but we updated the data to display wrongly.
+
+ -- Peter Palfrader <weasel@debian.org>  Mon, 24 Nov 2008 11:24:16 +0100
+
 userdir-ldap (0.3.52) unstable; urgency=low
 
   * Remove cruft comment.

diff --git a/ud-info b/ud-info
index 1c91f1c..282d6a4 100755 (executable)
--- a/ud-info
+++ b/ud-info
@@ -299,10 +299,10 @@ def Lock(UserDn, Attrs, DisableMail=True):
       (ldap.MOD_REPLACE,"shadowExpire","1")];
    if DisableMail:
       recs.append( (ldap.MOD_REPLACE,"mailDisableMessage","account locked") )
-      Attrs[0][1]["shadowLastChange"] = [shadowLast];
+      Attrs[0][1]["mailDisableMessage"] = ["account locked"];
    l.modify_s(UserDn,recs);
    Attrs[0][1]["userPassword"] = ["{crypt}*LK*"];
-   Attrs[0][1]["mailDisableMessage"] = ["account locked"];
+   Attrs[0][1]["shadowLastChange"] = [shadowLast];
    Attrs[0][1]["shadowExpire"] = ["1"];
 
 # Main program starts here