[Da-tools-commits] ./debian/userdir-ldap r416: When we touch usePassword in ud-info or ud-mailgate we now also update

[Peter Palfrader]

------------------------------------------------------------
revno: 416
committer: Peter Palfrader <peter at palfrader.org>
branch nick: userdir-ldap
timestamp: Thu 2008-05-22 22:26:49 +0200
message:
  When we touch usePassword in ud-info or ud-mailgate we now also update
  shadowLastChange.
modified:
  debian/changelog
  ud-info
  ud-mailgate
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2008-05-22 19:50:12 +0000
+++ b/debian/changelog	2008-05-22 20:26:49 +0000
@@ -1,3 +1,10 @@
+userdir-ldap (0.3.XX) Xnstable; urgency=low
+
+  * When we touch usePassword in ud-info or ud-mailgate we now also
+    update shadowLastChange.
+
+ -- Peter Palfrader <weasel at debian.org>  Thu, 22 May 2008 22:26:11 +0200
+
 userdir-ldap (0.3.29) unstable; urgency=low
 
   * ud-info: Add an option "L" to lock accounts in the interactive

=== modified file 'ud-info'
--- a/ud-info	2008-05-22 19:50:12 +0000
+++ b/ud-info	2008-05-22 20:26:49 +0000
@@ -375,8 +375,11 @@
 
       print "Setting password..";
       Pass = "{crypt}" + Pass;
-      l.modify_s(UserDn,[(ldap.MOD_REPLACE,"userPassword",Pass)]);
+      shadowLast = str(int(time.time()/24/60/60));
+      l.modify_s(UserDn,[(ldap.MOD_REPLACE,"userPassword",Pass),
+                         (ldap.MOD_REPLACE,"shadowLastChange",shadowLast)]);
       Attrs[0][1]["userPassword"] = [Pass];
+      Attrs[0][1]["shadowLastChange"] = [shadowLast];
       continue;
 
    # Randomize password
@@ -396,8 +399,11 @@
 	 
       print "Setting password..";
       Pass = "{crypt}" + Pass;
-      l.modify_s(UserDn,[(ldap.MOD_REPLACE,"userPassword",Pass)]);
+      shadowLast = str(int(time.time()/24/60/60));
+      l.modify_s(UserDn,[(ldap.MOD_REPLACE,"userPassword",Pass),
+                         (ldap.MOD_REPLACE,"shadowLastChange",shadowLast)]);
       Attrs[0][1]["userPassword"] = [Pass];
+      Attrs[0][1]["shadowLastChange"] = [shadowLast];
       continue;
 
    # Lock account
@@ -407,11 +413,14 @@
          continue;
 
       print "Setting password..";
+      shadowLast = str(int(time.time()/24/60/60));
       l.modify_s(UserDn,[
          (ldap.MOD_REPLACE,"userPassword","{crypt}*LK*"),
-         (ldap.MOD_REPLACE,"mailDisableMessage","account locked"), ]);
+         (ldap.MOD_REPLACE,"mailDisableMessage","account locked"),
+         (ldap.MOD_REPLACE,"shadowLastChange",shadowLast)]);
       Attrs[0][1]["userPassword"] = ["{crypt}*LK*"];
       Attrs[0][1]["mailDisableMessage"] = ["account locked"];
+      Attrs[0][1]["shadowLastChange"] = [shadowLast];
       continue;
 
    # Handle changing an arbitary value

=== modified file 'ud-mailgate'
--- a/ud-mailgate	2008-05-18 12:26:33 +0000
+++ b/ud-mailgate	2008-05-22 20:26:49 +0000
@@ -551,7 +551,8 @@
       raise Error, "This account is locked";
 
    # Modify the password
-   Rec = [(ldap.MOD_REPLACE,"userPassword","{crypt}"+Pass)];
+   Rec = [(ldap.MOD_REPLACE,"userPassword","{crypt}"+Pass),
+          (ldap.MOD_REPLACE,"shadowLastChange",str(int(time.time()/24/60/60)))];
    Dn = "uid=" + GetAttr(DnRecord,"uid") + "," + BaseDn;
    l.modify_s(Dn,Rec);