svn commit: samba r4917 - in branches/SAMBA_3_0/source: lib libsmb utils

[jra at samba.org]

Author: jra
Date: 2005-01-22 01:22:39 +0000 (Sat, 22 Jan 2005)
New Revision: 4917

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=4917

Log:
Merge some of Derrell.Lipman at UnwiredUniverse.com obvious fixes.
Added text explaining units in pdbedit time fields.
Jeremy.

Modified:
   branches/SAMBA_3_0/source/lib/account_pol.c
   branches/SAMBA_3_0/source/libsmb/cliconnect.c
   branches/SAMBA_3_0/source/libsmb/clisecdesc.c
   branches/SAMBA_3_0/source/utils/pdbedit.c


Changeset:
Modified: branches/SAMBA_3_0/source/lib/account_pol.c
===================================================================
--- branches/SAMBA_3_0/source/lib/account_pol.c	2005-01-22 00:52:54 UTC (rev 4916)
+++ branches/SAMBA_3_0/source/lib/account_pol.c	2005-01-22 01:22:39 UTC (rev 4917)
@@ -118,8 +118,8 @@
 	{AP_MIN_PASSWORD_LEN, "min password length"},
 	{AP_PASSWORD_HISTORY, "password history"},
 	{AP_USER_MUST_LOGON_TO_CHG_PASS, "user must logon to change password"},
-	{AP_MAX_PASSWORD_AGE, "maximum password age"},
-	{AP_MIN_PASSWORD_AGE,"minimum password age"},
+	{AP_MAX_PASSWORD_AGE, "maximum password age (seconds since 1970)"},
+	{AP_MIN_PASSWORD_AGE,"minimum password age (seconds since 1970)"},
 	{AP_LOCK_ACCOUNT_DURATION, "lockout duration"},
 	{AP_RESET_COUNT_TIME, "reset count minutes"},
 	{AP_BAD_ATTEMPT_LOCKOUT, "bad lockout attempt"},

Modified: branches/SAMBA_3_0/source/libsmb/cliconnect.c
===================================================================
--- branches/SAMBA_3_0/source/libsmb/cliconnect.c	2005-01-22 00:52:54 UTC (rev 4916)
+++ branches/SAMBA_3_0/source/libsmb/cliconnect.c	2005-01-22 01:22:39 UTC (rev 4917)
@@ -989,7 +989,12 @@
 	if (!cli_receive_smb(cli))
 		return False;
 	
-	return !cli_is_error(cli);
+	if (cli_is_error(cli)) {
+		return False;
+	}
+
+	cli->cnum = -1;
+	return True;
 }
 
 /****************************************************************************

Modified: branches/SAMBA_3_0/source/libsmb/clisecdesc.c
===================================================================
--- branches/SAMBA_3_0/source/libsmb/clisecdesc.c	2005-01-22 00:52:54 UTC (rev 4916)
+++ branches/SAMBA_3_0/source/libsmb/clisecdesc.c	2005-01-22 01:22:39 UTC (rev 4917)
@@ -30,6 +30,7 @@
 	char *rparam=NULL, *rdata=NULL;
 	unsigned int rparam_count=0, rdata_count=0;
 	prs_struct pd;
+	BOOL pd_initialized = False;
 	SEC_DESC *psd = NULL;
 
 	SIVAL(param, 0, fnum);
@@ -56,7 +57,10 @@
 	if (cli_is_error(cli))
 		goto cleanup;
 
-	prs_init(&pd, rdata_count, mem_ctx, UNMARSHALL);
+	if (!prs_init(&pd, rdata_count, mem_ctx, UNMARSHALL)) {
+		goto cleanup;
+	}
+	pd_initialized = True;
 	prs_copy_data_in(&pd, rdata, rdata_count);
 	prs_set_offset(&pd,0);
 
@@ -70,7 +74,8 @@
 	SAFE_FREE(rparam);
 	SAFE_FREE(rdata);
 
-	prs_mem_free(&pd);
+	if (pd_initialized)
+		prs_mem_free(&pd);
 	return psd;
 }
 

Modified: branches/SAMBA_3_0/source/utils/pdbedit.c
===================================================================
--- branches/SAMBA_3_0/source/utils/pdbedit.c	2005-01-22 00:52:54 UTC (rev 4916)
+++ branches/SAMBA_3_0/source/utils/pdbedit.c	2005-01-22 01:22:39 UTC (rev 4917)
@@ -694,8 +694,8 @@
 		{"force-initialized-passwords", 0, POPT_ARG_NONE, &force_initialised_password, 0, "Force initialization of corrupt password strings in a passdb backend", NULL},
 		{"bad-password-count-reset", 'z', POPT_ARG_NONE, &badpw_reset, 0, "reset bad password count", NULL},
 		{"logon-hours-reset", 'Z', POPT_ARG_NONE, &hours_reset, 0, "reset logon hours", NULL},
-		{"pwd-can-change-time", 0, POPT_ARG_STRING, &pwd_can_change_time, 0, "Set password can change time (unix time if time format no provided)", NULL },
-		{"pwd-must-change-time", 0, POPT_ARG_STRING, &pwd_must_change_time, 0, "Set password can change time (unix time if time format no provided)", NULL },
+		{"pwd-can-change-time", 0, POPT_ARG_STRING, &pwd_can_change_time, 0, "Set password can change time (unix time in seconds since 1970 if time format no provided)", NULL },
+		{"pwd-must-change-time", 0, POPT_ARG_STRING, &pwd_must_change_time, 0, "Set password can change time (unix time in seconds since 1970 if time format no provided)", NULL },
 		{"time-format", 0, POPT_ARG_STRING, &pwd_time_format, 0, "The time format for time parameters", NULL },
 		POPT_COMMON_SAMBA
 		POPT_TABLEEND