Fixed the bug with member servers in a Samba PDC hosted domain not allowing

other access. Problem was max time was being set to 0xffffffff, instead of
0x7fffffff.
Jeremy.
(This used to be commit 94403d841710391ec26539e4b4157439d5778ff7)

10 files changed, 629 insertions, 593 deletions

diff --git a/source3/lib/debug.c b/source3/lib/debug.c
index 9eb490c27e..6524d58ecb 100644
--- a/source3/lib/debug.c
+++ b/source3/lib/debug.c
@@ -346,8 +346,14 @@ BOOL reopen_logs( void )
 	oldumask = umask( 022 );
   
 	pstrcpy(fname, debugf );
-	if (lp_loaded() && (*lp_logfile()))
-		pstrcpy(fname, lp_logfile());
+
+	if (lp_loaded()) {
+		char *logfname;
+
+		logfname = lp_logfile();
+		if (*logfname)
+			pstrcpy(fname, logfname);
+	}
 
 	pstrcpy( debugf, fname );
 	if (append_log)
diff --git a/source3/lib/time.c b/source3/lib/time.c
index 59106386d4..cf088e8ee4 100644
--- a/source3/lib/time.c
+++ b/source3/lib/time.c
@@ -42,7 +42,19 @@ int extra_time_offset = 0;
 #define TIME_T_MAX (~ (time_t) 0 - TIME_T_MIN)
 #endif
 
+/*******************************************************************
+ External access to time_t_min and time_t_max.
+********************************************************************/
 
+time_t get_time_t_min(void)
+{
+	return TIME_T_MIN;
+}
+
+time_t get_time_t_max(void)
+{
+	return TIME_T_MAX;
+}
 
 /*******************************************************************
 a gettimeofday wrapper
@@ -305,6 +317,12 @@ void unix_to_nt_time(NTTIME *nt, time_t t)
 		nt->high = 0;
 		return;
 	}
+	if (t == TIME_T_MAX)
+	{
+		nt->low = 0xffffffff;
+		nt->high = 0x7fffffff;
+		return;
+	}		
 	if (t == -1)
 	{
 		nt->low = 0xffffffff;
diff --git a/source3/passdb/passdb.c b/source3/passdb/passdb.c
index b1e1e2b989..96c11de73a 100644
--- a/source3/passdb/passdb.c
+++ b/source3/passdb/passdb.c
@@ -77,11 +77,11 @@ static BOOL pdb_fill_default_sam(SAM_ACCOUNT *user)
 	
 	ZERO_STRUCTP(user);
 	user->logon_time            = (time_t)0;
-	user->logoff_time           = (time_t)0;
-	user->kickoff_time          = (time_t)0;
-	user->pass_last_set_time    = (time_t)0;
-	user->pass_can_change_time  = (time_t)0;
-	user->pass_must_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 */
 	user->logon_divs = 168; 	/* hours per week */
@@ -140,7 +140,6 @@ BOOL pdb_init_sam_pw(SAM_ACCOUNT **new_sam_acct, struct passwd *pwd)
 	pdb_set_fullname(*new_sam_acct, pwd->pw_gecos);
 	pdb_set_uid(*new_sam_acct, pwd->pw_uid);
 	pdb_set_gid(*new_sam_acct, pwd->pw_gid);
-	pdb_set_pass_last_set_time(*new_sam_acct, time(NULL));
 	pdb_set_profile_path(*new_sam_acct, lp_logon_path());
 	pdb_set_homedir(*new_sam_acct, lp_logon_home());
 	pdb_set_dir_drive(*new_sam_acct, lp_logon_drive());
diff --git a/source3/passdb/pdb_nisplus.c b/source3/passdb/pdb_nisplus.c
index 5bb94c90b7..b73072015b 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, -1);
+  pdb_set_logon_time(pw_buf, get_time_t_max());
   ptr = (uchar *)ENTRY_VAL(obj, NPF_LOGON_T);
   if(ptr && *ptr && (StrnCaseCmp(ptr, "LNT-", 4)==0)) {
     int i;
@@ -223,7 +223,7 @@ static BOOL make_sam_from_nisp_object(SAM_ACCOUNT *pw_buf, nis_object *obj)
     }
   }
 
-  pdb_set_logoff_time(pw_buf, -1);
+  pdb_set_logoff_time(pw_buf, get_time_t_max());
   ptr = (uchar *)ENTRY_VAL(obj, NPF_LOGOFF_T);
   if(ptr && *ptr && (StrnCaseCmp(ptr, "LOT-", 4)==0)) {
     int i;
@@ -237,7 +237,7 @@ static BOOL make_sam_from_nisp_object(SAM_ACCOUNT *pw_buf, nis_object *obj)
     }
   }
 
-  pdb_set_kickoff_time(pw_buf, -1);
+  pdb_set_kickoff_time(pw_buf, get_time_t_max());
   ptr = (uchar *)ENTRY_VAL(obj, NPF_KICK_T);
   if(ptr && *ptr && (StrnCaseCmp(ptr, "KOT-", 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, -1);
+  pdb_set_pass_last_set_time(pw_buf, get_time_t_max());
   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, -1);
+  pdb_set_pass_can_change_time(pw_buf, get_time_t_max());
   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, -1);
+  pdb_set_pass_must_change_time(pw_buf, get_time_t_max());
   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 b01f03e124..7d14d3e0e0 100644
--- a/source3/passdb/pdb_smbpasswd.c
+++ b/source3/passdb/pdb_smbpasswd.c
@@ -101,17 +101,16 @@ static BOOL pw_file_unlock(int fd, int *plock_depth)
 /**************************************************************
  Intialize a smb_passwd struct
  *************************************************************/
+
 static void pdb_init_smb(struct smb_passwd *user)
 {
-        if (user == NULL) 
+	if (user == NULL) 
 		return;
-        ZERO_STRUCTP (user);
+	ZERO_STRUCTP (user);
 	
-        user->pass_last_set_time    = (time_t)-1;
+	user->pass_last_set_time = get_time_t_max();
 }
 
-
-
 /***************************************************************
  Internal fn to enumerate the smbpasswd list. Returns a void pointer
  to ensure no modification outside this module. Checks for atomic
@@ -1154,22 +1153,21 @@ Error was %s\n", pwd->smb_name, pfile2, strerror(errno)));
  ********************************************************************/
 static BOOL build_smb_pass (struct smb_passwd *smb_pw, SAM_ACCOUNT *sampass)
 {
-        if (sampass == NULL) 
+	if (sampass == NULL) 
 		return False;
 
-        ZERO_STRUCTP(smb_pw);
+	ZERO_STRUCTP(smb_pw);
 
-        smb_pw->smb_userid=pdb_get_uid(sampass);
-        smb_pw->smb_name=pdb_get_username(sampass);
+	smb_pw->smb_userid=pdb_get_uid(sampass);
+	smb_pw->smb_name=pdb_get_username(sampass);
 
 	smb_pw->smb_passwd=pdb_get_lanman_passwd(sampass);
 	smb_pw->smb_nt_passwd=pdb_get_nt_passwd(sampass);
 
-        smb_pw->acct_ctrl=pdb_get_acct_ctrl(sampass);
-        smb_pw->pass_last_set_time=pdb_get_pass_last_set_time(sampass);
-
-        return True;
+	smb_pw->acct_ctrl=pdb_get_acct_ctrl(sampass);
+	smb_pw->pass_last_set_time=pdb_get_pass_last_set_time(sampass);
 
+	return True;
 }	
 
 /*********************************************************************
diff --git a/source3/po/Makefile.in b/source3/po/Makefile.in
index 417827413e..2c2c1dd495 100644
--- a/source3/po/Makefile.in
+++ b/source3/po/Makefile.in
@@ -79,7 +79,7 @@ INSTOBJEXT = .mo
 	rm -f $@ && $(GENCAT) $@ $*.msg
 
 
-all: cat-id-tbl.c
+all: all-yes
 
 all-yes: cat-id-tbl.c $(CATALOGS)
 all-no:
@@ -229,8 +229,6 @@ update-po: Makefile
 	  fi; \
 	done
 
-update-gmo: $(CATALOGS)
-
 POTFILES: POTFILES.in
 	( if test 'x$(srcdir)' != 'x.'; then \
 	    posrcprefix='$(top_srcdir)/'; \
diff --git a/source3/po/cat-id-tbl.c b/source3/po/cat-id-tbl.c
index 05129f2989..043bcfb93a 100644
--- a/source3/po/cat-id-tbl.c
+++ b/source3/po/cat-id-tbl.c
@@ -196,237 +196,240 @@ const struct _msg_ent _msg_tbl[] = {
   {"ssl server key", 187},
   {"ssl client cert", 188},
   {"ssl client key", 189},
-  {"ssl require clientcert", 190},
-  {"ssl require servercert", 191},
-  {"ssl ciphers", 192},
-  {"ssl version", 193},
-  {"ssl compatibility", 194},
-  {"Logging Options", 195},
-  {"log level", 196},
-  {"debuglevel", 197},
-  {"syslog", 198},
-  {"syslog only", 199},
-  {"log file", 200},
-  {"max log size", 201},
-  {"timestamp logs", 202},
-  {"debug timestamp", 203},
-  {"debug hires timestamp", 204},
-  {"debug pid", 205},
-  {"debug uid", 206},
-  {"Protocol Options", 207},
-  {"protocol", 208},
-  {"large readwrite", 209},
-  {"max protocol", 210},
-  {"min protocol", 211},
-  {"unicode", 212},
-  {"read bmpx", 213},
-  {"read raw", 214},
-  {"write raw", 215},
-  {"nt pipe support", 216},
-  {"nt acl support", 217},
-  {"announce version", 218},
-  {"announce as", 219},
-  {"max mux", 220},
-  {"max xmit", 221},
-  {"name resolve order", 222},
-  {"max packet", 223},
-  {"packet size", 224},
-  {"max ttl", 225},
-  {"max wins ttl", 226},
-  {"min wins ttl", 227},
-  {"time server", 228},
-  {"Tuning Options", 229},
-  {"change notify timeout", 230},
-  {"deadtime", 231},
-  {"getwd cache", 232},
-  {"keepalive", 233},
-  {"lpq cache time", 234},
-  {"max smbd processes", 235},
-  {"max connections", 236},
-  {"paranoid server security", 237},
-  {"max disk size", 238},
-  {"max open files", 239},
-  {"min print space", 240},
-  {"read size", 241},
-  {"socket options", 242},
-  {"stat cache size", 243},
-  {"strict allocate", 244},
-  {"strict sync", 245},
-  {"sync always", 246},
-  {"use mmap", 247},
-  {"hostname lookups", 248},
-  {"write cache size", 249},
-  {"Printing Options", 250},
-  {"total print jobs", 251},
-  {"max print jobs", 252},
-  {"load printers", 253},
-  {"printcap name", 254},
-  {"printcap", 255},
-  {"printable", 256},
-  {"print ok", 257},
-  {"postscript", 258},
-  {"printing", 259},
-  {"print command", 260},
-  {"disable spoolss", 261},
-  {"lpq command", 262},
-  {"lprm command", 263},
-  {"lppause command", 264},
-  {"lpresume command", 265},
-  {"queuepause command", 266},
-  {"queueresume command", 267},
-  {"enumports command", 268},
-  {"addprinter command", 269},
-  {"deleteprinter command", 270},
-  {"show add printer wizard", 271},
-  {"os2 driver map", 272},
-  {"printer name", 273},
-  {"printer", 274},
-  {"use client driver", 275},
-  {"printer driver", 276},
-  {"printer driver file", 277},
-  {"printer driver location", 278},
-  {"Filename Handling", 279},
-  {"strip dot", 280},
-  {"mangled stack", 281},
-  {"default case", 282},
-  {"case sensitive", 283},
-  {"casesignames", 284},
-  {"preserve case", 285},
-  {"short preserve case", 286},
-  {"mangle case", 287},
-  {"mangling char", 288},
-  {"hide dot files", 289},
-  {"hide unreadable", 290},
-  {"delete veto files", 291},
-  {"veto files", 292},
-  {"hide files", 293},
-  {"veto oplock files", 294},
-  {"map system", 295},
-  {"map hidden", 296},
-  {"map archive", 297},
-  {"mangled names", 298},
-  {"mangled map", 299},
-  {"stat cache", 300},
-  {"Domain Options", 301},
-  {"domain admin group", 302},
-  {"domain guest group", 303},
-  {"groupname map", 304},
-  {"machine password timeout", 305},
-  {"Logon Options", 306},
-  {"add user script", 307},
-  {"delete user script", 308},
-  {"add group script", 309},
-  {"delete group script", 310},
-  {"add user to group script", 311},
-  {"delete user from group script", 312},
-  {"add machine script", 313},
-  {"shutdown script", 314},
-  {"abort shutdown script", 315},
-  {"logon script", 316},
-  {"logon path", 317},
-  {"logon drive", 318},
-  {"logon home", 319},
-  {"domain logons", 320},
-  {"Browse Options", 321},
-  {"os level", 322},
-  {"lm announce", 323},
-  {"lm interval", 324},
-  {"preferred master", 325},
-  {"prefered master", 326},
-  {"local master", 327},
-  {"domain master", 328},
-  {"browse list", 329},
-  {"browseable", 330},
-  {"browsable", 331},
-  {"enhanced browsing", 332},
-  {"WINS Options", 333},
-  {"dns proxy", 334},
-  {"wins proxy", 335},
-  {"wins server", 336},
-  {"wins support", 337},
-  {"wins hook", 338},
-  {"Locking Options", 339},
-  {"blocking locks", 340},
-  {"fake oplocks", 341},
-  {"kernel oplocks", 342},
-  {"locking", 343},
-  {"oplocks", 344},
-  {"level2 oplocks", 345},
-  {"oplock break wait time", 346},
-  {"oplock contention limit", 347},
-  {"posix locking", 348},
-  {"strict locking", 349},
-  {"share modes", 350},
-  {"Ldap Options", 351},
-  {"ldap server", 352},
-  {"ldap port", 353},
-  {"ldap suffix", 354},
-  {"ldap filter", 355},
-  {"ldap root", 356},
-  {"ldap root passwd", 357},
-  {"Miscellaneous Options", 358},
-  {"add share command", 359},
-  {"change share command", 360},
-  {"delete share command", 361},
-  {"config file", 362},
-  {"preload", 363},
-  {"auto services", 364},
-  {"lock dir", 365},
-  {"lock directory", 366},
-  {"utmp directory", 367},
-  {"wtmp directory", 368},
-  {"utmp", 369},
-  {"default service", 370},
-  {"default", 371},
-  {"message command", 372},
-  {"dfree command", 373},
-  {"remote announce", 374},
-  {"remote browse sync", 375},
-  {"socket address", 376},
-  {"homedir map", 377},
-  {"time offset", 378},
-  {"NIS homedir", 379},
-  {"-valid", 380},
-  {"copy", 381},
-  {"include", 382},
-  {"exec", 383},
-  {"preexec", 384},
-  {"preexec close", 385},
-  {"postexec", 386},
-  {"root preexec", 387},
-  {"root preexec close", 388},
-  {"root postexec", 389},
-  {"available", 390},
-  {"volume", 391},
-  {"fstype", 392},
-  {"set directory", 393},
-  {"source environment", 394},
-  {"wide links", 395},
-  {"follow symlinks", 396},
-  {"dont descend", 397},
-  {"magic script", 398},
-  {"magic output", 399},
-  {"delete readonly", 400},
-  {"dos filemode", 401},
-  {"dos filetimes", 402},
-  {"dos filetime resolution", 403},
-  {"fake directory create times", 404},
-  {"panic action", 405},
-  {"hide local users", 406},
-  {"VFS options", 407},
-  {"vfs object", 408},
-  {"vfs options", 409},
-  {"msdfs root", 410},
-  {"host msdfs", 411},
-  {"Winbind options", 412},
-  {"winbind uid", 413},
-  {"winbind gid", 414},
-  {"template homedir", 415},
-  {"template shell", 416},
-  {"winbind separator", 417},
-  {"winbind cache time", 418},
-  {"winbind enum users", 419},
-  {"winbind enum groups", 420},
+  {"ssl egd socket", 190},
+  {"ssl entropy file", 191},
+  {"ssl entropy bytes", 192},
+  {"ssl require clientcert", 193},
+  {"ssl require servercert", 194},
+  {"ssl ciphers", 195},
+  {"ssl version", 196},
+  {"ssl compatibility", 197},
+  {"Logging Options", 198},
+  {"log level", 199},
+  {"debuglevel", 200},
+  {"syslog", 201},
+  {"syslog only", 202},
+  {"log file", 203},
+  {"max log size", 204},
+  {"timestamp logs", 205},
+  {"debug timestamp", 206},
+  {"debug hires timestamp", 207},
+  {"debug pid", 208},
+  {"debug uid", 209},
+  {"Protocol Options", 210},
+  {"protocol", 211},
+  {"large readwrite", 212},
+  {"max protocol", 213},
+  {"min protocol", 214},
+  {"unicode", 215},
+  {"read bmpx", 216},
+  {"read raw", 217},
+  {"write raw", 218},
+  {"nt pipe support", 219},
+  {"nt acl support", 220},
+  {"announce version", 221},
+  {"announce as", 222},
+  {"max mux", 223},
+  {"max xmit", 224},
+  {"name resolve order", 225},
+  {"max packet", 226},
+  {"packet size", 227},
+  {"max ttl", 228},
+  {"max wins ttl", 229},
+  {"min wins ttl", 230},
+  {"time server", 231},
+  {"Tuning Options", 232},
+  {"change notify timeout", 233},
+  {"deadtime", 234},
+  {"getwd cache", 235},
+  {"keepalive", 236},
+  {"lpq cache time", 237},
+  {"max smbd processes", 238},
+  {"max connections", 239},
+  {"paranoid server security", 240},
+  {"max disk size", 241},
+  {"max open files", 242},
+  {"min print space", 243},
+  {"read size", 244},
+  {"socket options", 245},
+  {"stat cache size", 246},
+  {"strict allocate", 247},
+  {"strict sync", 248},
+  {"sync always", 249},
+  {"use mmap", 250},
+  {"hostname lookups", 251},
+  {"write cache size", 252},
+  {"Printing Options", 253},
+  {"total print jobs", 254},
+  {"max print jobs", 255},
+  {"load printers", 256},
+  {"printcap name", 257},
+  {"printcap", 258},
+  {"printable", 259},
+  {"print ok", 260},
+  {"postscript", 261},
+  {"printing", 262},
+  {"print command", 263},
+  {"disable spoolss", 264},
+  {"lpq command", 265},
+  {"lprm command", 266},
+  {"lppause command", 267},
+  {"lpresume command", 268},
+  {"queuepause command", 269},
+  {"queueresume command", 270},
+  {"enumports command", 271},
+  {"addprinter command", 272},
+  {"deleteprinter command", 273},
+  {"show add printer wizard", 274},
+  {"os2 driver map", 275},
+  {"printer name", 276},
+  {"printer", 277},
+  {"use client driver", 278},
+  {"printer driver", 279},
+  {"printer driver file", 280},
+  {"printer driver location", 281},
+  {"Filename Handling", 282},
+  {"strip dot", 283},
+  {"mangled stack", 284},
+  {"default case", 285},
+  {"case sensitive", 286},
+  {"casesignames", 287},
+  {"preserve case", 288},
+  {"short preserve case", 289},
+  {"mangle case", 290},
+  {"mangling char", 291},
+  {"hide dot files", 292},
+  {"hide unreadable", 293},
+  {"delete veto files", 294},
+  {"veto files", 295},
+  {"hide files", 296},
+  {"veto oplock files", 297},
+  {"map system", 298},
+  {"map hidden", 299},
+  {"map archive", 300},
+  {"mangled names", 301},
+  {"mangled map", 302},
+  {"stat cache", 303},
+  {"Domain Options", 304},
+  {"domain admin group", 305},
+  {"domain guest group", 306},
+  {"groupname map", 307},
+  {"machine password timeout", 308},
+  {"Logon Options", 309},
+  {"add user script", 310},
+  {"delete user script", 311},
+  {"add group script", 312},
+  {"delete group script", 313},
+  {"add user to group script", 314},
+  {"delete user from group script", 315},
+  {"add machine script", 316},
+  {"shutdown script", 317},
+  {"abort shutdown script", 318},
+  {"logon script", 319},
+  {"logon path", 320},
+  {"logon drive", 321},
+  {"logon home", 322},
+  {"domain logons", 323},
+  {"Browse Options", 324},
+  {"os level", 325},
+  {"lm announce", 326},
+  {"lm interval", 327},
+  {"preferred master", 328},
+  {"prefered master", 329},
+  {"local master", 330},
+  {"domain master", 331},
+  {"browse list", 332},
+  {"browseable", 333},
+  {"browsable", 334},
+  {"enhanced browsing", 335},
+  {"WINS Options", 336},
+  {"dns proxy", 337},
+  {"wins proxy", 338},
+  {"wins server", 339},
+  {"wins support", 340},
+  {"wins hook", 341},
+  {"Locking Options", 342},
+  {"blocking locks", 343},
+  {"fake oplocks", 344},
+  {"kernel oplocks", 345},
+  {"locking", 346},
+  {"oplocks", 347},
+  {"level2 oplocks", 348},
+  {"oplock break wait time", 349},
+  {"oplock contention limit", 350},
+  {"posix locking", 351},
+  {"strict locking", 352},
+  {"share modes", 353},
+  {"Ldap Options", 354},
+  {"ldap server", 355},
+  {"ldap port", 356},
+  {"ldap suffix", 357},
+  {"ldap filter", 358},
+  {"ldap root", 359},
+  {"ldap root passwd", 360},
+  {"Miscellaneous Options", 361},
+  {"add share command", 362},
+  {"change share command", 363},
+  {"delete share command", 364},
+  {"config file", 365},
+  {"preload", 366},
+  {"auto services", 367},
+  {"lock dir", 368},
+  {"lock directory", 369},
+  {"utmp directory", 370},
+  {"wtmp directory", 371},
+  {"utmp", 372},
+  {"default service", 373},
+  {"default", 374},
+  {"message command", 375},
+  {"dfree command", 376},
+  {"remote announce", 377},
+  {"remote browse sync", 378},
+  {"socket address", 379},
+  {"homedir map", 380},
+  {"time offset", 381},
+  {"NIS homedir", 382},
+  {"-valid", 383},
+  {"copy", 384},
+  {"include", 385},
+  {"exec", 386},
+  {"preexec", 387},
+  {"preexec close", 388},
+  {"postexec", 389},
+  {"root preexec", 390},
+  {"root preexec close", 391},
+  {"root postexec", 392},
+  {"available", 393},
+  {"volume", 394},
+  {"fstype", 395},
+  {"set directory", 396},
+  {"source environment", 397},
+  {"wide links", 398},
+  {"follow symlinks", 399},
+  {"dont descend", 400},
+  {"magic script", 401},
+  {"magic output", 402},
+  {"delete readonly", 403},
+  {"dos filemode", 404},
+  {"dos filetimes", 405},
+  {"dos filetime resolution", 406},
+  {"fake directory create times", 407},
+  {"panic action", 408},
+  {"hide local users", 409},
+  {"VFS options", 410},
+  {"vfs object", 411},
+  {"vfs options", 412},
+  {"msdfs root", 413},
+  {"host msdfs", 414},
+  {"Winbind options", 415},
+  {"winbind uid", 416},
+  {"winbind gid", 417},
+  {"template homedir", 418},
+  {"template shell", 419},
+  {"winbind separator", 420},
+  {"winbind cache time", 421},
+  {"winbind enum users", 422},
+  {"winbind enum groups", 423},
 };
 
-int _msg_tbl_length = 420;
+int _msg_tbl_length = 423;
diff --git a/source3/po/i18n_swat.pot b/source3/po/i18n_swat.pot
index 9c8c41a759..5723a815df 100644
--- a/source3/po/i18n_swat.pot
+++ b/source3/po/i18n_swat.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-09-25 13:07-0700\n"
+"POT-Creation-Date: 2001-10-01 23:40-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -402,1298 +402,1310 @@ msgstr ""
 msgid "File"
 msgstr ""
 
-#: param/loadparm.c:641
+#: param/loadparm.c:644
 msgid "Base Options"
 msgstr ""
 
-#: param/loadparm.c:643
+#: param/loadparm.c:646
 msgid "dos charset"
 msgstr ""
 
-#: param/loadparm.c:644
+#: param/loadparm.c:647
 msgid "unix charset"
 msgstr ""
 
-#: param/loadparm.c:645
+#: param/loadparm.c:648
 msgid "display charset"
 msgstr ""
 
-#: param/loadparm.c:646
+#: param/loadparm.c:649
 msgid "comment"
 msgstr ""
 
-#: param/loadparm.c:647
+#: param/loadparm.c:650
 msgid "path"
 msgstr ""
 
-#: param/loadparm.c:648
+#: param/loadparm.c:651
 msgid "directory"
 msgstr ""
 
-#: param/loadparm.c:649
+#: param/loadparm.c:652
 msgid "workgroup"
 msgstr ""
 
-#: param/loadparm.c:650
+#: param/loadparm.c:653
 msgid "netbios name"
 msgstr ""
 
-#: param/loadparm.c:651
+#: param/loadparm.c:654
 msgid "netbios aliases"
 msgstr ""
 
-#: param/loadparm.c:652
+#: param/loadparm.c:655
 msgid "netbios scope"
 msgstr ""
 
-#: param/loadparm.c:653
+#: param/loadparm.c:656
 msgid "server string"
 msgstr ""
 
-#: param/loadparm.c:654
+#: param/loadparm.c:657
 msgid "interfaces"
 msgstr ""
 
-#: param/loadparm.c:655
+#: param/loadparm.c:658
 msgid "bind interfaces only"
 msgstr ""
 
-#: param/loadparm.c:657
+#: param/loadparm.c:660
 msgid "Security Options"
 msgstr ""
 
-#: param/loadparm.c:659
+#: param/loadparm.c:662
 msgid "security"
 msgstr ""
 
-#: param/loadparm.c:660
+#: param/loadparm.c:663
 msgid "encrypt passwords"
 msgstr ""
 
-#: param/loadparm.c:661
+#: param/loadparm.c:664
 msgid "update encrypted"
 msgstr ""
 
-#: param/loadparm.c:662
+#: param/loadparm.c:665
 msgid "allow trusted domains"
 msgstr ""
 
-#: param/loadparm.c:663
+#: param/loadparm.c:666
 msgid "alternate permissions"
 msgstr ""
 
-#: param/loadparm.c:664
+#: param/loadparm.c:667
 msgid "hosts equiv"
 msgstr ""
 
-#: param/loadparm.c:665
+#: param/loadparm.c:668
 msgid "min passwd length"
 msgstr ""
 
-#: param/loadparm.c:666
+#: param/loadparm.c:669
 msgid "min password length"
 msgstr ""
 
-#: param/loadparm.c:667
+#: param/loadparm.c:670
 msgid "map to guest"
 msgstr ""
 
-#: param/loadparm.c:668
+#: param/loadparm.c:671
 msgid "null passwords"
 msgstr ""
 
-#: param/loadparm.c:669
+#: param/loadparm.c:672
 msgid "obey pam restrictions"
 msgstr ""
 
-#: param/loadparm.c:670
+#: param/loadparm.c:673
 msgid "password server"
 msgstr ""
 
-#: param/loadparm.c:671
+#: param/loadparm.c:674
 msgid "smb passwd file"
 msgstr ""
 
-#: param/loadparm.c:672
+#: param/loadparm.c:675
 msgid "private dir"
 msgstr ""
 
-#: param/loadparm.c:673
+#: param/loadparm.c:676
 msgid "passdb module path"
 msgstr ""
 
-#: param/loadparm.c:674
+#: param/loadparm.c:677
 msgid "root directory"
 msgstr ""
 
-#: param/loadparm.c:675
+#: param/loadparm.c:678
 msgid "root dir"
 msgstr ""
 
-#: param/loadparm.c:676
+#: param/loadparm.c:679
 msgid "root"
 msgstr ""
 
-#: param/loadparm.c:678
+#: param/loadparm.c:681
 msgid "pam password change"
 msgstr ""
 
-#: param/loadparm.c:679
+#: param/loadparm.c:682
 msgid "passwd program"
 msgstr ""
 
-#: param/loadparm.c:680
+#: param/loadparm.c:683
 msgid "passwd chat"
 msgstr ""
 
-#: param/loadparm.c:681
+#: param/loadparm.c:684
 msgid "passwd chat debug"
 msgstr ""
 
-#: param/loadparm.c:682
+#: param/loadparm.c:685
 msgid "username map"
 msgstr ""
 
-#: param/loadparm.c:683
+#: param/loadparm.c:686
 msgid "password level"
 msgstr ""
 
-#: param/loadparm.c:684
+#: param/loadparm.c:687
 msgid "username level"
 msgstr ""
 
-#: param/loadparm.c:685
+#: param/loadparm.c:688
 msgid "unix password sync"
 msgstr ""
 
-#: param/loadparm.c:686
+#: param/loadparm.c:689
 msgid "restrict anonymous"
 msgstr ""
 
-#: param/loadparm.c:687
+#: param/loadparm.c:690
 msgid "lanman auth"
 msgstr ""
 
-#: param/loadparm.c:688
+#: param/loadparm.c:691
 msgid "ntlm auth"
 msgstr ""
 
-#: param/loadparm.c:689
+#: param/loadparm.c:692
 msgid "plaintext to smbpasswd"
 msgstr ""
 
-#: param/loadparm.c:690
+#: param/loadparm.c:693
 msgid "use rhosts"
 msgstr ""
 
-#: param/loadparm.c:692
+#: param/loadparm.c:695
 msgid "username"
 msgstr ""
 
-#: param/loadparm.c:693
+#: param/loadparm.c:696
 msgid "user"
 msgstr ""
 
-#: param/loadparm.c:694
+#: param/loadparm.c:697
 msgid "users"
 msgstr ""
 
-#: param/loadparm.c:696
+#: param/loadparm.c:699
 msgid "guest account"
 msgstr ""
 
-#: param/loadparm.c:697
+#: param/loadparm.c:700
 msgid "invalid users"
 msgstr ""
 
-#: param/loadparm.c:698
+#: param/loadparm.c:701
 msgid "valid users"
 msgstr ""
 
-#: param/loadparm.c:699
+#: param/loadparm.c:702
 msgid "admin users"
 msgstr ""
 
-#: param/loadparm.c:700
+#: param/loadparm.c:703
 msgid "read list"
 msgstr ""
 
-#: param/loadparm.c:701
+#: param/loadparm.c:704
 msgid "write list"
 msgstr ""
 
-#: param/loadparm.c:702
+#: param/loadparm.c:705
 msgid "printer admin"
 msgstr ""
 
-#: param/loadparm.c:703
+#: param/loadparm.c:706
 msgid "force user"
 msgstr ""
 
-#: param/loadparm.c:704
+#: param/loadparm.c:707
 msgid "force group"
 msgstr ""
 
-#: param/loadparm.c:705
+#: param/loadparm.c:708
 msgid "group"
 msgstr ""
 
-#: param/loadparm.c:707
+#: param/loadparm.c:710
 msgid "read only"
 msgstr ""
 
-#: param/loadparm.c:708
+#: param/loadparm.c:711
 msgid "write ok"
 msgstr ""
 
-#: param/loadparm.c:709
+#: param/loadparm.c:712
 msgid "writeable"
 msgstr ""
 
-#: param/loadparm.c:710
+#: param/loadparm.c:713
 msgid "writable"
 msgstr ""
 
-#: param/loadparm.c:712
+#: param/loadparm.c:715
 msgid "create mask"
 msgstr ""
 
-#: param/loadparm.c:713
+#: param/loadparm.c:716
 msgid "create mode"
 msgstr ""
 
-#: param/loadparm.c:714
+#: param/loadparm.c:717
 msgid "force create mode"
 msgstr ""
 
-#: param/loadparm.c:715
+#: param/loadparm.c:718
 msgid "security mask"
 msgstr ""
 
-#: param/loadparm.c:716
+#: param/loadparm.c:719
 msgid "force security mode"
 msgstr ""
 
-#: param/loadparm.c:717
+#: param/loadparm.c:720
 msgid "directory mask"
 msgstr ""
 
-#: param/loadparm.c:718
+#: param/loadparm.c:721
 msgid "directory mode"
 msgstr ""
 
-#: param/loadparm.c:719
+#: param/loadparm.c:722
 msgid "force directory mode"
 msgstr ""
 
-#: param/loadparm.c:720
+#: param/loadparm.c:723
 msgid "directory security mask"
 msgstr ""
 
-#: param/loadparm.c:721
+#: param/loadparm.c:724
 msgid "force directory security mode"
 msgstr ""
 
-#: param/loadparm.c:722
+#: param/loadparm.c:725
 msgid "inherit permissions"
 msgstr ""
 
-#: param/loadparm.c:723
+#: param/loadparm.c:726
 msgid "guest only"
 msgstr ""
 
-#: param/loadparm.c:724
+#: param/loadparm.c:727
 msgid "only guest"
 msgstr ""
 
-#: param/loadparm.c:726
+#: param/loadparm.c:729
 msgid "guest ok"
 msgstr ""
 
-#: param/loadparm.c:727
+#: param/loadparm.c:730
 msgid "public"
 msgstr ""
 
-#: param/loadparm.c:729
+#: param/loadparm.c:732
 msgid "only user"
 msgstr ""
 
-#: param/loadparm.c:730
+#: param/loadparm.c:733
 msgid "hosts allow"
 msgstr ""
 
-#: param/loadparm.c:731
+#: param/loadparm.c:734
 msgid "allow hosts"
 msgstr ""
 
-#: param/loadparm.c:732
+#: param/loadparm.c:735
 msgid "hosts deny"
 msgstr ""
 
-#: param/loadparm.c:733
+#: param/loadparm.c:736
 msgid "deny hosts"
 msgstr ""
 
-#: param/loadparm.c:736
+#: param/loadparm.c:739
 msgid "Secure Socket Layer Options"
 msgstr ""
 
-#: param/loadparm.c:737
+#: param/loadparm.c:740
 msgid "ssl"
 msgstr ""
 
-#: param/loadparm.c:739
+#: param/loadparm.c:742
 msgid "ssl hosts"
 msgstr ""
 
-#: param/loadparm.c:740
+#: param/loadparm.c:743
 msgid "ssl hosts resign"
 msgstr ""
 
-#: param/loadparm.c:741
+#: param/loadparm.c:744
 msgid "ssl CA certDir"
 msgstr ""
 
-#: param/loadparm.c:742
+#: param/loadparm.c:745
 msgid "ssl CA certFile"
 msgstr ""
 
-#: param/loadparm.c:743
+#: param/loadparm.c:746
 msgid "ssl server cert"
 msgstr ""
 
-#: param/loadparm.c:744
+#: param/loadparm.c:747
 msgid "ssl server key"
 msgstr ""
 
-#: param/loadparm.c:745
+#: param/loadparm.c:748
 msgid "ssl client cert"
 msgstr ""
 
-#: param/loadparm.c:746
+#: param/loadparm.c:749
 msgid "ssl client key"
 msgstr ""
 
-#: param/loadparm.c:747
+#: param/loadparm.c:750
+msgid "ssl egd socket"
+msgstr ""
+
+#: param/loadparm.c:751
+msgid "ssl entropy file"
+msgstr ""
+
+#: param/loadparm.c:752
+msgid "ssl entropy bytes"
+msgstr ""
+
+#: param/loadparm.c:753
 msgid "ssl require clientcert"
 msgstr ""
 
-#: param/loadparm.c:748
+#: param/loadparm.c:754
 msgid "ssl require servercert"
 msgstr ""
 
-#: param/loadparm.c:749
+#: param/loadparm.c:755
 msgid "ssl ciphers"
 msgstr ""
 
-#: param/loadparm.c:750
+#: param/loadparm.c:756
 msgid "ssl version"
 msgstr ""
 
-#: param/loadparm.c:751
+#: param/loadparm.c:757
 msgid "ssl compatibility"
 msgstr ""
 
-#: param/loadparm.c:754
+#: param/loadparm.c:760
 msgid "Logging Options"
 msgstr ""
 
-#: param/loadparm.c:755
+#: param/loadparm.c:761
 msgid "log level"
 msgstr ""
 
-#: param/loadparm.c:756
+#: param/loadparm.c:762
 msgid "debuglevel"
 msgstr ""
 
-#: param/loadparm.c:757
+#: param/loadparm.c:763
 msgid "syslog"
 msgstr ""
 
-#: param/loadparm.c:758
+#: param/loadparm.c:764
 msgid "syslog only"
 msgstr ""
 
-#: param/loadparm.c:759
+#: param/loadparm.c:765
 msgid "log file"
 msgstr ""
 
-#: param/loadparm.c:761
+#: param/loadparm.c:767
 msgid "max log size"
 msgstr ""
 
-#: param/loadparm.c:762
+#: param/loadparm.c:768
 msgid "timestamp logs"
 msgstr ""
 
-#: param/loadparm.c:763
+#: param/loadparm.c:769
 msgid "debug timestamp"
 msgstr ""
 
-#: param/loadparm.c:764
+#: param/loadparm.c:770
 msgid "debug hires timestamp"
 msgstr ""
 
-#: param/loadparm.c:765
+#: param/loadparm.c:771
 msgid "debug pid"
 msgstr ""
 
-#: param/loadparm.c:766
+#: param/loadparm.c:772
 msgid "debug uid"
 msgstr ""
 
-#: param/loadparm.c:768
+#: param/loadparm.c:774
 msgid "Protocol Options"
 msgstr ""
 
-#: param/loadparm.c:770
+#: param/loadparm.c:776
 msgid "protocol"
 msgstr ""
 
-#: param/loadparm.c:771
+#: param/loadparm.c:777
 msgid "large readwrite"
 msgstr ""
 
-#: param/loadparm.c:772
+#: param/loadparm.c:778
 msgid "max protocol"
 msgstr ""
 
-#: param/loadparm.c:773
+#: param/loadparm.c:779
 msgid "min protocol"
 msgstr ""
 
-#: param/loadparm.c:774
+#: param/loadparm.c:780
 msgid "unicode"
 msgstr ""
 
-#: param/loadparm.c:775
+#: param/loadparm.c:781
 msgid "read bmpx"
 msgstr ""
 
-#: param/loadparm.c:776
+#: param/loadparm.c:782
 msgid "read raw"
 msgstr ""
 
-#: param/loadparm.c:777
+#: param/loadparm.c:783
 msgid "write raw"
 msgstr ""
 
-#: param/loadparm.c:779
+#: param/loadparm.c:785
 msgid "nt pipe support"
 msgstr ""
 
-#: param/loadparm.c:780
+#: param/loadparm.c:786
 msgid "nt acl support"
 msgstr ""
 
-#: param/loadparm.c:781
+#: param/loadparm.c:787
 msgid "announce version"
 msgstr ""
 
-#: param/loadparm.c:782
+#: param/loadparm.c:788
 msgid "announce as"
 msgstr ""
 
-#: param/loadparm.c:783
+#: param/loadparm.c:789
 msgid "max mux"
 msgstr ""
 
-#: param/loadparm.c:784
+#: param/loadparm.c:790
 msgid "max xmit"
 msgstr ""
 
-#: param/loadparm.c:786
+#: param/loadparm.c:792
 msgid "name resolve order"
 msgstr ""
 
-#: param/loadparm.c:787
+#: param/loadparm.c:793
 msgid "max packet"
 msgstr ""
 
-#: param/loadparm.c:788
+#: param/loadparm.c:794
 msgid "packet size"
 msgstr ""
 
-#: param/loadparm.c:789
+#: param/loadparm.c:795
 msgid "max ttl"
 msgstr ""
 
-#: param/loadparm.c:790
+#: param/loadparm.c:796
 msgid "max wins ttl"
 msgstr ""
 
-#: param/loadparm.c:791
+#: param/loadparm.c:797
 msgid "min wins ttl"
 msgstr ""
 
-#: param/loadparm.c:792
+#: param/loadparm.c:798
 msgid "time server"
 msgstr ""
 
-#: param/loadparm.c:794
+#: param/loadparm.c:800
 msgid "Tuning Options"
 msgstr ""
 
-#: param/loadparm.c:796
+#: param/loadparm.c:802
 msgid "change notify timeout"
 msgstr ""
 
-#: param/loadparm.c:797
+#: param/loadparm.c:803
 msgid "deadtime"
 msgstr ""
 
-#: param/loadparm.c:798
+#: param/loadparm.c:804
 msgid "getwd cache"
 msgstr ""
 
-#: param/loadparm.c:799
+#: param/loadparm.c:805
 msgid "keepalive"
 msgstr ""
 
-#: param/loadparm.c:801
+#: param/loadparm.c:807
 msgid "lpq cache time"
 msgstr ""
 
-#: param/loadparm.c:802
+#: param/loadparm.c:808
 msgid "max smbd processes"
 msgstr ""
 
-#: param/loadparm.c:803
+#: param/loadparm.c:809
 msgid "max connections"
 msgstr ""
 
-#: param/loadparm.c:804
+#: param/loadparm.c:810
 msgid "paranoid server security"
 msgstr ""
 
-#: param/loadparm.c:805
+#: param/loadparm.c:811
 msgid "max disk size"
 msgstr ""
 
-#: param/loadparm.c:806
+#: param/loadparm.c:812
 msgid "max open files"
 msgstr ""
 
-#: param/loadparm.c:807
+#: param/loadparm.c:813
 msgid "min print space"
 msgstr ""
 
-#: param/loadparm.c:808
+#: param/loadparm.c:814
 msgid "read size"
 msgstr ""
 
-#: param/loadparm.c:810
+#: param/loadparm.c:816
 msgid "socket options"
 msgstr ""
 
-#: param/loadparm.c:811
+#: param/loadparm.c:817
 msgid "stat cache size"
 msgstr ""
 
-#: param/loadparm.c:812
+#: param/loadparm.c:818
 msgid "strict allocate"
 msgstr ""
 
-#: param/loadparm.c:813
+#: param/loadparm.c:819
 msgid "strict sync"
 msgstr ""
 
-#: param/loadparm.c:814
+#: param/loadparm.c:820
 msgid "sync always"
 msgstr ""
 
-#: param/loadparm.c:815
+#: param/loadparm.c:821
 msgid "use mmap"
 msgstr ""
 
-#: param/loadparm.c:816
+#: param/loadparm.c:822
 msgid "hostname lookups"
 msgstr ""
 
-#: param/loadparm.c:817
+#: param/loadparm.c:823
 msgid "write cache size"
 msgstr ""
 
-#: param/loadparm.c:819
+#: param/loadparm.c:825
 msgid "Printing Options"
 msgstr ""
 
-#: param/loadparm.c:821
+#: param/loadparm.c:827
 msgid "total print jobs"
 msgstr ""
 
-#: param/loadparm.c:822
+#: param/loadparm.c:828
 msgid "max print jobs"
 msgstr ""
 
-#: param/loadparm.c:823
+#: param/loadparm.c:829
 msgid "load printers"
 msgstr ""
 
-#: param/loadparm.c:824
+#: param/loadparm.c:830
 msgid "printcap name"
 msgstr ""
 
-#: param/loadparm.c:825
+#: param/loadparm.c:831
 msgid "printcap"
 msgstr ""
 
-#: param/loadparm.c:826
+#: param/loadparm.c:832
 msgid "printable"
 msgstr ""
 
-#: param/loadparm.c:827
+#: param/loadparm.c:833
 msgid "print ok"
 msgstr ""
 
-#: param/loadparm.c:828
+#: param/loadparm.c:834
 msgid "postscript"
 msgstr ""
 
-#: param/loadparm.c:829
+#: param/loadparm.c:835
 msgid "printing"
 msgstr ""
 
-#: param/loadparm.c:830
+#: param/loadparm.c:836
 msgid "print command"
 msgstr ""
 
-#: param/loadparm.c:831
+#: param/loadparm.c:837
 msgid "disable spoolss"
 msgstr ""
 
-#: param/loadparm.c:832
+#: param/loadparm.c:838
 msgid "lpq command"
 msgstr ""
 
-#: param/loadparm.c:833
+#: param/loadparm.c:839
 msgid "lprm command"
 msgstr ""
 
-#: param/loadparm.c:834
+#: param/loadparm.c:840
 msgid "lppause command"
 msgstr ""
 
-#: param/loadparm.c:835
+#: param/loadparm.c:841
 msgid "lpresume command"
 msgstr ""
 
-#: param/loadparm.c:836
+#: param/loadparm.c:842
 msgid "queuepause command"
 msgstr ""
 
-#: param/loadparm.c:837
+#: param/loadparm.c:843
 msgid "queueresume command"
 msgstr ""
 
-#: param/loadparm.c:839
+#: param/loadparm.c:845
 msgid "enumports command"
 msgstr ""
 
-#: param/loadparm.c:840
+#: param/loadparm.c:846
 msgid "addprinter command"
 msgstr ""
 
-#: param/loadparm.c:841
+#: param/loadparm.c:847
 msgid "deleteprinter command"
 msgstr ""
 
-#: param/loadparm.c:842
+#: param/loadparm.c:848
 msgid "show add printer wizard"
 msgstr ""
 
-#: param/loadparm.c:843
+#: param/loadparm.c:849
 msgid "os2 driver map"
 msgstr ""
 
-#: param/loadparm.c:845
+#: param/loadparm.c:851
 msgid "printer name"
 msgstr ""
 
-#: param/loadparm.c:846
+#: param/loadparm.c:852
 msgid "printer"
 msgstr ""
 
-#: param/loadparm.c:847
+#: param/loadparm.c:853
 msgid "use client driver"
 msgstr ""
 
-#: param/loadparm.c:848
+#: param/loadparm.c:854
 msgid "printer driver"
 msgstr ""
 
-#: param/loadparm.c:849
+#: param/loadparm.c:855
 msgid "printer driver file"
 msgstr ""
 
-#: param/loadparm.c:850
+#: param/loadparm.c:856
 msgid "printer driver location"
 msgstr ""
 
-#: param/loadparm.c:852
+#: param/loadparm.c:858
 msgid "Filename Handling"
 msgstr ""
 
-#: param/loadparm.c:853
+#: param/loadparm.c:859
 msgid "strip dot"
 msgstr ""
 
-#: param/loadparm.c:855
+#: param/loadparm.c:861
 msgid "mangled stack"
 msgstr ""
 
-#: param/loadparm.c:856
+#: param/loadparm.c:862
 msgid "default case"
 msgstr ""
 
-#: param/loadparm.c:857
+#: param/loadparm.c:863
 msgid "case sensitive"
 msgstr ""
 
-#: param/loadparm.c:858
+#: param/loadparm.c:864
 msgid "casesignames"
 msgstr ""
 
-#: param/loadparm.c:859
+#: param/loadparm.c:865
 msgid "preserve case"
 msgstr ""
 
-#: param/loadparm.c:860
+#: param/loadparm.c:866
 msgid "short preserve case"
 msgstr ""
 
-#: param/loadparm.c:861
+#: param/loadparm.c:867
 msgid "mangle case"
 msgstr ""
 
-#: param/loadparm.c:862
+#: param/loadparm.c:868
 msgid "mangling char"
 msgstr ""
 
-#: param/loadparm.c:863
+#: param/loadparm.c:869
 msgid "hide dot files"
 msgstr ""
 
-#: param/loadparm.c:864
+#: param/loadparm.c:870
 msgid "hide unreadable"
 msgstr ""
 
-#: param/loadparm.c:865
+#: param/loadparm.c:871
 msgid "delete veto files"
 msgstr ""
 
-#: param/loadparm.c:866
+#: param/loadparm.c:872
 msgid "veto files"
 msgstr ""
 
-#: param/loadparm.c:867
+#: param/loadparm.c:873
 msgid "hide files"
 msgstr ""
 
-#: param/loadparm.c:868
+#: param/loadparm.c:874
 msgid "veto oplock files"
 msgstr ""
 
-#: param/loadparm.c:869
+#: param/loadparm.c:875
 msgid "map system"
 msgstr ""
 
-#: param/loadparm.c:870
+#: param/loadparm.c:876
 msgid "map hidden"
 msgstr ""
 
-#: param/loadparm.c:871
+#: param/loadparm.c:877
 msgid "map archive"
 msgstr ""
 
-#: param/loadparm.c:872
+#: param/loadparm.c:878
 msgid "mangled names"
 msgstr ""
 
-#: param/loadparm.c:873
+#: param/loadparm.c:879
 msgid "mangled map"
 msgstr ""
 
-#: param/loadparm.c:874
+#: param/loadparm.c:880
 msgid "stat cache"
 msgstr ""
 
-#: param/loadparm.c:876
+#: param/loadparm.c:882
 msgid "Domain Options"
 msgstr ""
 
-#: param/loadparm.c:878
+#: param/loadparm.c:884
 msgid "domain admin group"
 msgstr ""
 
-#: param/loadparm.c:879
+#: param/loadparm.c:885
 msgid "domain guest group"
 msgstr ""
 
-#: param/loadparm.c:882
+#: param/loadparm.c:888
 msgid "groupname map"
 msgstr ""
 
-#: param/loadparm.c:885
+#: param/loadparm.c:891
 msgid "machine password timeout"
 msgstr ""
 
-#: param/loadparm.c:887
+#: param/loadparm.c:893
 msgid "Logon Options"
 msgstr ""
 
-#: param/loadparm.c:889
+#: param/loadparm.c:895
 msgid "add user script"
 msgstr ""
 
-#: param/loadparm.c:890
+#: param/loadparm.c:896
 msgid "delete user script"
 msgstr ""
 
-#: param/loadparm.c:891
+#: param/loadparm.c:897
 msgid "add group script"
 msgstr ""
 
-#: param/loadparm.c:892
+#: param/loadparm.c:898
 msgid "delete group script"
 msgstr ""
 
-#: param/loadparm.c:893
+#: param/loadparm.c:899
 msgid "add user to group script"
 msgstr ""
 
-#: param/loadparm.c:894
+#: param/loadparm.c:900
 msgid "delete user from group script"
 msgstr ""
 
-#: param/loadparm.c:895
+#: param/loadparm.c:901
 msgid "add machine script"
 msgstr ""
 
-#: param/loadparm.c:896
+#: param/loadparm.c:902
 msgid "shutdown script"
 msgstr ""
 
-#: param/loadparm.c:897
+#: param/loadparm.c:903
 msgid "abort shutdown script"
 msgstr ""
 
-#: param/loadparm.c:899
+#: param/loadparm.c:905
 msgid "logon script"
 msgstr ""
 
-#: param/loadparm.c:900
+#: param/loadparm.c:906
 msgid "logon path"
 msgstr ""
 
-#: param/loadparm.c:901
+#: param/loadparm.c:907
 msgid "logon drive"
 msgstr ""
 
-#: param/loadparm.c:902
+#: param/loadparm.c:908
 msgid "logon home"
 msgstr ""
 
-#: param/loadparm.c:903
+#: param/loadparm.c:909
 msgid "domain logons"
 msgstr ""
 
-#: param/loadparm.c:905
+#: param/loadparm.c:911
 msgid "Browse Options"
 msgstr ""
 
-#: param/loadparm.c:907
+#: param/loadparm.c:913
 msgid "os level"
 msgstr ""
 
-#: param/loadparm.c:908
+#: param/loadparm.c:914
 msgid "lm announce"
 msgstr ""
 
-#: param/loadparm.c:909
+#: param/loadparm.c:915
 msgid "lm interval"
 msgstr ""
 
-#: param/loadparm.c:910
+#: param/loadparm.c:916
 msgid "preferred master"
 msgstr ""
 
-#: param/loadparm.c:911
+#: param/loadparm.c:917
 msgid "prefered master"
 msgstr ""
 
-#: param/loadparm.c:912
+#: param/loadparm.c:918
 msgid "local master"
 msgstr ""
 
-#: param/loadparm.c:913
+#: param/loadparm.c:919
 msgid "domain master"
 msgstr ""
 
-#: param/loadparm.c:914
+#: param/loadparm.c:920
 msgid "browse list"
 msgstr ""
 
-#: param/loadparm.c:915
+#: param/loadparm.c:921
 msgid "browseable"
 msgstr ""
 
-#: param/loadparm.c:916
+#: param/loadparm.c:922
 msgid "browsable"
 msgstr ""
 
-#: param/loadparm.c:917
+#: param/loadparm.c:923
 msgid "enhanced browsing"
 msgstr ""
 
-#: param/loadparm.c:919
+#: param/loadparm.c:925
 msgid "WINS Options"
 msgstr ""
 
-#: param/loadparm.c:920
+#: param/loadparm.c:926
 msgid "dns proxy"
 msgstr ""
 
-#: param/loadparm.c:921
+#: param/loadparm.c:927
 msgid "wins proxy"
 msgstr ""
 
-#: param/loadparm.c:923
+#: param/loadparm.c:929
 msgid "wins server"
 msgstr ""
 
-#: param/loadparm.c:924
+#: param/loadparm.c:930
 msgid "wins support"
 msgstr ""
 
-#: param/loadparm.c:925
+#: param/loadparm.c:931
 msgid "wins hook"
 msgstr ""
 
-#: param/loadparm.c:927
+#: param/loadparm.c:933
 msgid "Locking Options"
 msgstr ""
 
-#: param/loadparm.c:929
+#: param/loadparm.c:935
 msgid "blocking locks"
 msgstr ""
 
-#: param/loadparm.c:930
+#: param/loadparm.c:936
 msgid "fake oplocks"
 msgstr ""
 
-#: param/loadparm.c:931
+#: param/loadparm.c:937
 msgid "kernel oplocks"
 msgstr ""
 
-#: param/loadparm.c:932
+#: param/loadparm.c:938
 msgid "locking"
 msgstr ""
 
-#: param/loadparm.c:934
+#: param/loadparm.c:940
 msgid "oplocks"
 msgstr ""
 
-#: param/loadparm.c:935
+#: param/loadparm.c:941
 msgid "level2 oplocks"
 msgstr ""
 
-#: param/loadparm.c:936
+#: param/loadparm.c:942
 msgid "oplock break wait time"
 msgstr ""
 
-#: param/loadparm.c:937
+#: param/loadparm.c:943
 msgid "oplock contention limit"
 msgstr ""
 
-#: param/loadparm.c:938
+#: param/loadparm.c:944
 msgid "posix locking"
 msgstr ""
 
-#: param/loadparm.c:939
+#: param/loadparm.c:945
 msgid "strict locking"
 msgstr ""
 
-#: param/loadparm.c:940
+#: param/loadparm.c:946
 msgid "share modes"
 msgstr ""
 
-#: param/loadparm.c:943
+#: param/loadparm.c:949
 msgid "Ldap Options"
 msgstr ""
 
-#: param/loadparm.c:945
+#: param/loadparm.c:951
 msgid "ldap server"
 msgstr ""
 
-#: param/loadparm.c:946
+#: param/loadparm.c:952
 msgid "ldap port"
 msgstr ""
 
-#: param/loadparm.c:947
+#: param/loadparm.c:953
 msgid "ldap suffix"
 msgstr ""
 
-#: param/loadparm.c:948
+#: param/loadparm.c:954
 msgid "ldap filter"
 msgstr ""
 
-#: param/loadparm.c:949
+#: param/loadparm.c:955
 msgid "ldap root"
 msgstr ""
 
-#: param/loadparm.c:950
+#: param/loadparm.c:956
 msgid "ldap root passwd"
 msgstr ""
 
-#: param/loadparm.c:953
+#: param/loadparm.c:959
 msgid "Miscellaneous Options"
 msgstr ""
 
-#: param/loadparm.c:954
+#: param/loadparm.c:960
 msgid "add share command"
 msgstr ""
 
-#: param/loadparm.c:955
+#: param/loadparm.c:961
 msgid "change share command"
 msgstr ""
 
-#: param/loadparm.c:956
+#: param/loadparm.c:962
 msgid "delete share command"
 msgstr ""
 
-#: param/loadparm.c:958
+#: param/loadparm.c:964
 msgid "config file"
 msgstr ""
 
-#: param/loadparm.c:959
+#: param/loadparm.c:965
 msgid "preload"
 msgstr ""
 
-#: param/loadparm.c:960
+#: param/loadparm.c:966
 msgid "auto services"
 msgstr ""
 
-#: param/loadparm.c:961
+#: param/loadparm.c:967
 msgid "lock dir"
 msgstr ""
 
-#: param/loadparm.c:962
+#: param/loadparm.c:968
 msgid "lock directory"
 msgstr ""
 
-#: param/loadparm.c:964
+#: param/loadparm.c:970
 msgid "utmp directory"
 msgstr ""
 
-#: param/loadparm.c:965
+#: param/loadparm.c:971
 msgid "wtmp directory"
 msgstr ""
 
-#: param/loadparm.c:966
+#: param/loadparm.c:972
 msgid "utmp"
 msgstr ""
 
-#: param/loadparm.c:969
+#: param/loadparm.c:975
 msgid "default service"
 msgstr ""
 
-#: param/loadparm.c:970
+#: param/loadparm.c:976
 msgid "default"
 msgstr ""
 
-#: param/loadparm.c:971
+#: param/loadparm.c:977
 msgid "message command"
 msgstr ""
 
-#: param/loadparm.c:972
+#: param/loadparm.c:978
 msgid "dfree command"
 msgstr ""
 
-#: param/loadparm.c:973
+#: param/loadparm.c:979
 msgid "remote announce"
 msgstr ""
 
-#: param/loadparm.c:974
+#: param/loadparm.c:980
 msgid "remote browse sync"
 msgstr ""
 
-#: param/loadparm.c:975
+#: param/loadparm.c:981
 msgid "socket address"
 msgstr ""
 
-#: param/loadparm.c:976
+#: param/loadparm.c:982
 msgid "homedir map"
 msgstr ""
 
-#: param/loadparm.c:977
+#: param/loadparm.c:983
 msgid "time offset"
 msgstr ""
 
-#: param/loadparm.c:978
+#: param/loadparm.c:984
 msgid "NIS homedir"
 msgstr ""
 
-#: param/loadparm.c:979
+#: param/loadparm.c:985
 msgid "-valid"
 msgstr ""
 
-#: param/loadparm.c:981
+#: param/loadparm.c:987
 msgid "copy"
 msgstr ""
 
-#: param/loadparm.c:982
+#: param/loadparm.c:988
 msgid "include"
 msgstr ""
 
-#: param/loadparm.c:983
+#: param/loadparm.c:989
 msgid "exec"
 msgstr ""
 
-#: param/loadparm.c:984
+#: param/loadparm.c:990
 msgid "preexec"
 msgstr ""
 
-#: param/loadparm.c:986
+#: param/loadparm.c:992
 msgid "preexec close"
 msgstr ""
 
-#: param/loadparm.c:987
+#: param/loadparm.c:993
 msgid "postexec"
 msgstr ""
 
-#: param/loadparm.c:988
+#: param/loadparm.c:994
 msgid "root preexec"
 msgstr ""
 
-#: param/loadparm.c:989
+#: param/loadparm.c:995
 msgid "root preexec close"
 msgstr ""
 
-#: param/loadparm.c:990
+#: param/loadparm.c:996
 msgid "root postexec"
 msgstr ""
 
-#: param/loadparm.c:991
+#: param/loadparm.c:997
 msgid "available"
 msgstr ""
 
-#: param/loadparm.c:992
+#: param/loadparm.c:998
 msgid "volume"
 msgstr ""
 
-#: param/loadparm.c:993
+#: param/loadparm.c:999
 msgid "fstype"
 msgstr ""
 
-#: param/loadparm.c:994
+#: param/loadparm.c:1000
 msgid "set directory"
 msgstr ""
 
-#: param/loadparm.c:995
+#: param/loadparm.c:1001
 msgid "source environment"
 msgstr ""
 
-#: param/loadparm.c:996
+#: param/loadparm.c:1002
 msgid "wide links"
 msgstr ""
 
-#: param/loadparm.c:997
+#: param/loadparm.c:1003
 msgid "follow symlinks"
 msgstr ""
 
-#: param/loadparm.c:998
+#: param/loadparm.c:1004
 msgid "dont descend"
 msgstr ""
 
-#: param/loadparm.c:999
+#: param/loadparm.c:1005
 msgid "magic script"
 msgstr ""
 
-#: param/loadparm.c:1000
+#: param/loadparm.c:1006
 msgid "magic output"
 msgstr ""
 
-#: param/loadparm.c:1001
+#: param/loadparm.c:1007
 msgid "delete readonly"
 msgstr ""
 
-#: param/loadparm.c:1002
+#: param/loadparm.c:1008
 msgid "dos filemode"
 msgstr ""
 
-#: param/loadparm.c:1003
+#: param/loadparm.c:1009
 msgid "dos filetimes"
 msgstr ""
 
-#: param/loadparm.c:1004
+#: param/loadparm.c:1010
 msgid "dos filetime resolution"
 msgstr ""
 
-#: param/loadparm.c:1006
+#: param/loadparm.c:1012
 msgid "fake directory create times"
 msgstr ""
 
-#: param/loadparm.c:1007
+#: param/loadparm.c:1013
 msgid "panic action"
 msgstr ""
 
-#: param/loadparm.c:1008
+#: param/loadparm.c:1014
 msgid "hide local users"
 msgstr ""
 
-#: param/loadparm.c:1011
+#: param/loadparm.c:1017
 msgid "VFS options"
 msgstr ""
 
-#: param/loadparm.c:1013
+#: param/loadparm.c:1019
 msgid "vfs object"
 msgstr ""
 
-#: param/loadparm.c:1014
+#: param/loadparm.c:1020
 msgid "vfs options"
 msgstr ""
 
-#: param/loadparm.c:1017
+#: param/loadparm.c:1023
 msgid "msdfs root"
 msgstr ""
 
-#: param/loadparm.c:1018
+#: param/loadparm.c:1024
 msgid "host msdfs"
 msgstr ""
 
-#: param/loadparm.c:1020
+#: param/loadparm.c:1026
 msgid "Winbind options"
 msgstr ""
 
-#: param/loadparm.c:1022
+#: param/loadparm.c:1028
 msgid "winbind uid"
 msgstr ""
 
-#: param/loadparm.c:1023
+#: param/loadparm.c:1029
 msgid "winbind gid"
 msgstr ""
 
-#: param/loadparm.c:1024
+#: param/loadparm.c:1030
 msgid "template homedir"
 msgstr ""
 
-#: param/loadparm.c:1025
+#: param/loadparm.c:1031
 msgid "template shell"
 msgstr ""
 
-#: param/loadparm.c:1026
+#: param/loadparm.c:1032
 msgid "winbind separator"
 msgstr ""
 
-#: param/loadparm.c:1027
+#: param/loadparm.c:1033
 msgid "winbind cache time"
 msgstr ""
 
-#: param/loadparm.c:1028
+#: param/loadparm.c:1034
 msgid "winbind enum users"
 msgstr ""
 
-#: param/loadparm.c:1029
+#: param/loadparm.c:1035
 msgid "winbind enum groups"
 msgstr ""
diff --git a/source3/rpc_parse/parse_misc.c b/source3/rpc_parse/parse_misc.c
index 6353c9a8cd..5160a2778f 100644
--- a/source3/rpc_parse/parse_misc.c
+++ b/source3/rpc_parse/parse_misc.c
@@ -1240,6 +1240,7 @@ BOOL smb_io_cred(char *desc,  DOM_CRED *cred, prs_struct *ps, int depth)
 
 	if(!smb_io_chal ("", &cred->challenge, ps, depth))
 		return False;
+
 	if(!smb_io_utime("", &cred->timestamp, ps, depth))
 		return False;
 
diff --git a/source3/rpc_parse/parse_net.c b/source3/rpc_parse/parse_net.c
index cfd90241d0..a3ff179605 100644
--- a/source3/rpc_parse/parse_net.c
+++ b/source3/rpc_parse/parse_net.c
@@ -1260,6 +1260,7 @@ void init_net_user_info3(TALLOC_CTX *ctx, NET_USER_INFO_3 *usr, SAM_ACCOUNT *sam
 	usr->user_rid = pdb_get_user_rid(sampw);
 	usr->group_rid = pdb_get_group_rid(sampw);
 	usr->num_groups = num_groups+1;
+
 	usr->buffer_groups = 1; /* indicates fill in groups, below, even if there are none */
 	usr->user_flgs = user_flgs;
 
@@ -1339,17 +1340,17 @@ static BOOL net_io_user_info3(char *desc, NET_USER_INFO_3 *usr, prs_struct *ps,
 	if (usr->ptr_user_info == 0)
 		return True;
 
-	if(!smb_io_time("time", &usr->logon_time, ps, depth)) /* logon time */
+	if(!smb_io_time("logon time", &usr->logon_time, ps, depth)) /* logon time */
 		return False;
-	if(!smb_io_time("time", &usr->logoff_time, ps, depth)) /* logoff time */
+	if(!smb_io_time("logoff time", &usr->logoff_time, ps, depth)) /* logoff time */
 		return False;
-	if(!smb_io_time("time", &usr->kickoff_time, ps, depth)) /* kickoff time */
+	if(!smb_io_time("kickoff time", &usr->kickoff_time, ps, depth)) /* kickoff time */
 		return False;
-	if(!smb_io_time("time", &usr->pass_last_set_time, ps, depth)) /* password last set time */
+	if(!smb_io_time("last set time", &usr->pass_last_set_time, ps, depth)) /* password last set time */
 		return False;
-	if(!smb_io_time("time", &usr->pass_can_change_time , ps, depth)) /* password can change time */
+	if(!smb_io_time("can change time", &usr->pass_can_change_time , ps, depth)) /* password can change time */
 		return False;
-	if(!smb_io_time("time", &usr->pass_must_change_time, ps, depth)) /* password must change time */
+	if(!smb_io_time("must change time", &usr->pass_must_change_time, ps, depth)) /* password must change time */
 		return False;
 
 	if(!smb_io_unihdr("unihdr", &usr->hdr_user_name, ps, depth)) /* username unicode string header */