Changeset 733 for branches/samba-3.5.x/source3/passdb

Timestamp:

Nov 12, 2012, 5:09:31 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: update branche to 3.5.13

File:

• branches/samba-3.5.x/source3/passdb/pdb_get_set.c (modified) (5 diffs)

branches/samba-3.5.x/source3/passdb/pdb_get_set.c

@@ -38 +38 @@
 
 /*********************************************************************
+ Test if a change time is a max value. Copes with old and new values
+ of max.
+ ********************************************************************/
+
+bool pdb_is_password_change_time_max(time_t test_time)
+{
+        if (test_time == get_time_t_max()) {
+                return true;
+        }
+#if (defined(SIZEOF_TIME_T) && (SIZEOF_TIME_T == 8))
+        if (test_time == 0x7FFFFFFFFFFFFFFFLL) {
+                return true;
+        }
+#endif
+        if (test_time == 0x7FFFFFFF) {
+                return true;
+        }
+        return false;
+}
+
+/*********************************************************************
+ Return an unchanging version of max password change time - 0x7FFFFFFF.
+ ********************************************************************/
+
+time_t pdb_password_change_time_max(void)
+{
+        return 0x7FFFFFFF;
+}
+
+/*********************************************************************
  Collection of get...() functions for struct samu.
  ********************************************************************/
@@ -85 +115 @@
            to indicate that the user cannot change their password.  jmcd
         */
-        if (sampass->pass_can_change_time == get_time_t_max() &&
+        if (pdb_is_password_change_time_max(sampass->pass_can_change_time) &&
             pdb_get_init_flags(sampass, PDB_CANCHANGETIME) == PDB_CHANGED)
                 return sampass->pass_can_change_time;
@@ -111 +141 @@
 
         if (sampass->acct_ctrl & ACB_PWNOEXP)
-                return get_time_t_max();
+                return pdb_password_change_time_max();
 
         if (!pdb_get_account_policy(PDB_POLICY_MAX_PASSWORD_AGE, &expire)
             || expire == (uint32)-1 || expire == 0) 
-                return get_time_t_max();
+                return pdb_password_change_time_max();
 
         return sampass->pass_last_set_time + expire;
@@ -122 +152 @@
 bool pdb_get_pass_can_change(const struct samu *sampass)
 {
-        if (sampass->pass_can_change_time == get_time_t_max() &&
+        if (pdb_is_password_change_time_max(sampass->pass_can_change_time) &&
             sampass->pass_last_set_time != 0)
                 return False;
@@ -1002 +1032 @@
 {
         return pdb_set_pass_can_change_time(sampass, 
-                                     canchange ? 0 : get_time_t_max(),
+                                     canchange ? 0 : pdb_password_change_time_max(),
                                      PDB_CHANGED);
 }