Changeset 39 for trunk/samba/source/passdb/passdb.c

Timestamp:

May 27, 2007, 12:26:26 AM (18 years ago)

Author:

Paul Smedley

Message:

Upgrade source to 3.0.25a

File:

• trunk/samba/source/passdb/passdb.c (modified) (4 diffs)

trunk/samba/source/passdb/passdb.c

@@ -915 +915 @@
         }
 
-        pdb_set_logon_time(sampass, logon_time, PDB_SET);
-        pdb_set_logoff_time(sampass, logoff_time, PDB_SET);
-        pdb_set_kickoff_time(sampass, kickoff_time, PDB_SET);
-        pdb_set_bad_password_time(sampass, bad_password_time, PDB_SET);
-        pdb_set_pass_can_change_time(sampass, pass_can_change_time, PDB_SET);
-        pdb_set_pass_must_change_time(sampass, pass_must_change_time, PDB_SET);
-        pdb_set_pass_last_set_time(sampass, pass_last_set_time, PDB_SET);
+        pdb_set_logon_time(sampass, convert_uint32_to_time_t(logon_time), PDB_SET);
+        pdb_set_logoff_time(sampass, convert_uint32_to_time_t(logoff_time), PDB_SET);
+        pdb_set_kickoff_time(sampass, convert_uint32_to_time_t(kickoff_time), PDB_SET);
+        pdb_set_bad_password_time(sampass, convert_uint32_to_time_t(bad_password_time), PDB_SET);
+        pdb_set_pass_can_change_time(sampass, convert_uint32_to_time_t(pass_can_change_time), PDB_SET);
+        pdb_set_pass_must_change_time(sampass, convert_uint32_to_time_t(pass_must_change_time), PDB_SET);
+        pdb_set_pass_last_set_time(sampass, convert_uint32_to_time_t(pass_last_set_time), PDB_SET);
 
         pdb_set_username(sampass, username, PDB_SET); 
@@ -1103 +1103 @@
         buflen = 0;
 
-        logon_time = (uint32)pdb_get_logon_time(sampass);
-        logoff_time = (uint32)pdb_get_logoff_time(sampass);
-        kickoff_time = (uint32)pdb_get_kickoff_time(sampass);
-        bad_password_time = (uint32)pdb_get_bad_password_time(sampass);
-        pass_can_change_time = (uint32)pdb_get_pass_can_change_time_noncalc(sampass);
-        pass_must_change_time = (uint32)pdb_get_pass_must_change_time(sampass);
-        pass_last_set_time = (uint32)pdb_get_pass_last_set_time(sampass);
+        logon_time = convert_time_t_to_uint32(pdb_get_logon_time(sampass));
+        logoff_time = convert_time_t_to_uint32(pdb_get_logoff_time(sampass));
+        kickoff_time = convert_time_t_to_uint32(pdb_get_kickoff_time(sampass));
+        bad_password_time = convert_time_t_to_uint32(pdb_get_bad_password_time(sampass));
+        pass_can_change_time = convert_time_t_to_uint32(pdb_get_pass_can_change_time_noncalc(sampass));
+        pass_must_change_time = convert_time_t_to_uint32(pdb_get_pass_must_change_time(sampass));
+        pass_last_set_time = convert_time_t_to_uint32(pdb_get_pass_last_set_time(sampass));
 
         user_rid = pdb_get_user_rid(sampass);
@@ -1393 +1393 @@
         DEBUG(7, ("LastBadPassword=%d, resettime=%d, current time=%d.\n", 
                    (uint32) LastBadPassword, resettime, (uint32)time(NULL)));
-        if (time(NULL) > (LastBadPassword + (time_t)resettime*60)){
+        if (time(NULL) > (LastBadPassword + convert_uint32_to_time_t(resettime)*60)){
                 pdb_set_bad_password_count(sampass, 0, PDB_CHANGED);
                 pdb_set_bad_password_time(sampass, 0, PDB_CHANGED);
@@ -1446 +1446 @@
         }
 
-        if ((time(NULL) > (LastBadPassword + (time_t) duration * 60))) {
+        if ((time(NULL) > (LastBadPassword + convert_uint32_to_time_t(duration) * 60))) {
                 pdb_set_acct_ctrl(sampass,
                                   pdb_get_acct_ctrl(sampass) & ~ACB_AUTOLOCK,