Changeset 140 for branches/samba-3.0/source/rpc_server/srv_samr_util.c

Timestamp:

Jul 11, 2008, 1:13:42 AM (17 years ago)

Author:

Paul Smedley

Message:

Update branch to 3.0.31 release

File:

• branches/samba-3.0/source/rpc_server/srv_samr_util.c (modified) (3 diffs)

branches/samba-3.0/source/rpc_server/srv_samr_util.c

@@ -279 +279 @@
                         pdb_set_pass_last_set_time(to, 0, PDB_CHANGED);         
                 } else {
-                        pdb_set_pass_last_set_time(to, time(NULL),PDB_CHANGED);
+                        /* A subtlety here: some windows commands will
+                           clear the expired flag even though it's not
+                           set, and we don't want to reset the time
+                           in these caess.  "net user /dom <user> /active:y"
+                           for example, to clear an autolocked acct.
+                           We must check to see if it's expired first. jmcd */
+                        stored_time = pdb_get_pass_last_set_time(to);
+                        if (stored_time == 0)
+                                pdb_set_pass_last_set_time(to, time(NULL),PDB_CHANGED);
                 }
         }
@@ -493 +501 @@
                         pdb_set_pass_last_set_time(to, 0, PDB_CHANGED);         
                 } else {
-                        pdb_set_pass_last_set_time(to, time(NULL),PDB_CHANGED);
+                        /* A subtlety here: some windows commands will
+                           clear the expired flag even though it's not
+                           set, and we don't want to reset the time
+                           in these caess.  "net user /dom <user> /active:y"
+                           for example, to clear an autolocked acct.
+                           We must check to see if it's expired first. jmcd */
+                        stored_time = pdb_get_pass_last_set_time(to);
+                        if (stored_time == 0)
+                                pdb_set_pass_last_set_time(to, time(NULL),PDB_CHANGED);
                 }
         }
@@ -711 +727 @@
                         pdb_set_pass_last_set_time(to, 0, PDB_CHANGED);         
                 } else {
-                        pdb_set_pass_last_set_time(to, time(NULL),PDB_CHANGED);
+                        /* A subtlety here: some windows commands will
+                           clear the expired flag even though it's not
+                           set, and we don't want to reset the time
+                           in these caess.  "net user /dom <user> /active:y"
+                           for example, to clear an autolocked acct.
+                           We must check to see if it's expired first. jmcd */
+                        stored_time = pdb_get_pass_last_set_time(to);
+                        if (stored_time == 0)
+                                pdb_set_pass_last_set_time(to, time(NULL),PDB_CHANGED);
                 }
         }