[Da-tools-commits] ./debian/userdir-ldap r486: Properly show shadowlastchange and mail disabled message when locking an

[Peter Palfrader]

------------------------------------------------------------
revno: 486
committer: Peter Palfrader <peter at palfrader.org>
branch nick: userdir-ldap
timestamp: Mon 2008-11-24 11:25:18 +0100
message:
  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.
modified:
  debian/changelog
  ud-info
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2008-11-23 21:09:15 +0000
+++ b/debian/changelog	2008-11-24 10:25:18 +0000
@@ -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 at debian.org>  Mon, 24 Nov 2008 11:24:16 +0100
+
 userdir-ldap (0.3.52) unstable; urgency=low
 
   * Remove cruft comment.

=== modified file 'ud-info'
--- a/ud-info	2008-07-08 08:34:53 +0000
+++ b/ud-info	2008-11-24 10:25:18 +0000
@@ -299,10 +299,10 @@
       (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