3 files changed, 7 insertions, 7 deletions
diff --git a/source3/passdb/passdb.c b/source3/passdb/passdb.c
index 86ee97d281..0e1ebf8a28 100644
--- a/source3/passdb/passdb.c
+++ b/source3/passdb/passdb.c
@@ -77,10 +77,10 @@ static BOOL pdb_fill_default_sam(SAM_ACCOUNT *user)
 	
 	ZERO_STRUCTP(user);
 	user->logon_time            = (time_t)0;
+	user->pass_last_set_time    = (time_t)0;
+	user->pass_can_change_time  = (time_t)0;
 	user->logoff_time           = 
 	user->kickoff_time          = 
-	user->pass_last_set_time    = 
-	user->pass_can_change_time  = 
 	user->pass_must_change_time = get_time_t_max();
 
 	user->unknown_3 = 0x00ffffff; 	/* don't know */
diff --git a/source3/passdb/pdb_nisplus.c b/source3/passdb/pdb_nisplus.c
index b73072015b..af4bf1b823 100644
--- a/source3/passdb/pdb_nisplus.c
+++ b/source3/passdb/pdb_nisplus.c
@@ -209,7 +209,7 @@ static BOOL make_sam_from_nisp_object(SAM_ACCOUNT *pw_buf, nis_object *obj)
    * time values. note: this code assumes 32bit time_t!
    */
 
-  pdb_set_logon_time(pw_buf, get_time_t_max());
+  pdb_set_logon_time(pw_buf, (time_t)0);
   ptr = (uchar *)ENTRY_VAL(obj, NPF_LOGON_T);
   if(ptr && *ptr && (StrnCaseCmp(ptr, "LNT-", 4)==0)) {
     int i;
@@ -251,7 +251,7 @@ static BOOL make_sam_from_nisp_object(SAM_ACCOUNT *pw_buf, nis_object *obj)
     }
   }
 
-  pdb_set_pass_last_set_time(pw_buf, get_time_t_max());
+  pdb_set_pass_last_set_time(pw_buf, (time_t)0);
   ptr = (uchar *)ENTRY_VAL(obj, NPF_PWDLSET_T);
   if(ptr && *ptr && (StrnCaseCmp(ptr, "LCT-", 4)==0)) {
     int i;
@@ -265,7 +265,7 @@ static BOOL make_sam_from_nisp_object(SAM_ACCOUNT *pw_buf, nis_object *obj)
     }
   }
   
-  pdb_set_pass_can_change_time(pw_buf, get_time_t_max());
+  pdb_set_pass_can_change_time(pw_buf, (time_t)0);
   ptr = (uchar *)ENTRY_VAL(obj, NPF_PWDCCHG_T);
   if(ptr && *ptr && (StrnCaseCmp(ptr, "CCT-", 4)==0)) {
     int i;
@@ -279,7 +279,7 @@ static BOOL make_sam_from_nisp_object(SAM_ACCOUNT *pw_buf, nis_object *obj)
     }
   }
   
-  pdb_set_pass_must_change_time(pw_buf, get_time_t_max());
+  pdb_set_pass_must_change_time(pw_buf, get_time_t_max()); /* Password never expires. */
   ptr = (uchar *)ENTRY_VAL(obj, NPF_PWDMCHG_T);
   if(ptr && *ptr && (StrnCaseCmp(ptr, "MCT-", 4)==0)) {
     int i;
diff --git a/source3/passdb/pdb_smbpasswd.c b/source3/passdb/pdb_smbpasswd.c
index 7d14d3e0e0..45c983b1ca 100644
--- a/source3/passdb/pdb_smbpasswd.c
+++ b/source3/passdb/pdb_smbpasswd.c
@@ -108,7 +108,7 @@ static void pdb_init_smb(struct smb_passwd *user)
 		return;
 	ZERO_STRUCTP (user);
 	
-	user->pass_last_set_time = get_time_t_max();
+	user->pass_last_set_time = (time_t)0;
 }
 
 /***************************************************************