Merge HEAD and 2.2 - try frantically to keep in sync.

Jeremy.
(This used to be commit 65bf4a36ef5967b0844ab985d7b3ea31138dd4c5)

1 files changed, 13 insertions, 13 deletions

diff --git a/source3/passdb/passdb.c b/source3/passdb/passdb.c
index f02b1d2531..d29f140314 100644
--- a/source3/passdb/passdb.c
+++ b/source3/passdb/passdb.c
@@ -78,19 +78,19 @@ static BOOL pdb_fill_default_sam(SAM_ACCOUNT *user)
 	}
 	
 	ZERO_STRUCTP(user);
-	(user)->logon_time            = (time_t)0;
-	(user)->logoff_time           = (time_t)-1;
-	(user)->kickoff_time          = (time_t)-1;
-	(user)->pass_last_set_time    = (time_t)-1;
-	(user)->pass_can_change_time  = (time_t)-1;
-	(user)->pass_must_change_time = (time_t)-1;
-
-	(user)->unknown_3 = 0x00ffffff; 	/* don't know */
-	(user)->logon_divs = 168; 	/* hours per week */
-	(user)->hours_len = 21; 		/* 21 times 8 bits = 168 */
-	memset((user)->hours, 0xff, (user)->hours_len); /* available at all hours */
-	(user)->unknown_5 = 0x00000000; /* don't know */
-	(user)->unknown_6 = 0x000004ec; /* don't know */
+	user->logon_time            = (time_t)0;
+	user->logoff_time           = (time_t)-1;
+	user->kickoff_time          = (time_t)-1;
+	user->pass_last_set_time    = (time_t)-1;
+	user->pass_can_change_time  = (time_t)-1;
+	user->pass_must_change_time = (time_t)-1;
+
+	user->unknown_3 = 0x00ffffff; 	/* don't know */
+	user->logon_divs = 168; 	/* hours per week */
+	user->hours_len = 21; 		/* 21 times 8 bits = 168 */
+	memset(user->hours, 0xff, user->hours_len); /* available at all hours */
+	user->unknown_5 = 0x00000000; /* don't know */
+	user->unknown_6 = 0x000004ec; /* don't know */
 	return True;
 }