svn commit: samba r19711 - in branches/SAMBA_3_0_RELEASE: . source/nsswitch source/smbd

[jerry at samba.org]

Author: jerry
Date: 2006-11-15 05:28:33 +0000 (Wed, 15 Nov 2006)
New Revision: 19711

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

Log:
grab the deadtime parameter fix for 3.0.23d
Modified:
   branches/SAMBA_3_0_RELEASE/WHATSNEW.txt
   branches/SAMBA_3_0_RELEASE/source/nsswitch/pam_winbind.c
   branches/SAMBA_3_0_RELEASE/source/smbd/conn.c


Changeset:
Modified: branches/SAMBA_3_0_RELEASE/WHATSNEW.txt
===================================================================
--- branches/SAMBA_3_0_RELEASE/WHATSNEW.txt	2006-11-15 02:06:58 UTC (rev 19710)
+++ branches/SAMBA_3_0_RELEASE/WHATSNEW.txt	2006-11-15 05:28:33 UTC (rev 19711)
@@ -46,6 +46,7 @@
     * Fix protection from invalid struct tm values.
     * BUG 4187: Possible crash in signing on/off code.
     * BUG 4214: Fix crash bug in find_forced_group().
+    * BUG 4224: Fix enforcement of the deadtime parameter.
 
 
 o   Timur Bakeyev <timur at com.bat.ru>

Modified: branches/SAMBA_3_0_RELEASE/source/nsswitch/pam_winbind.c
===================================================================
--- branches/SAMBA_3_0_RELEASE/source/nsswitch/pam_winbind.c	2006-11-15 02:06:58 UTC (rev 19710)
+++ branches/SAMBA_3_0_RELEASE/source/nsswitch/pam_winbind.c	2006-11-15 05:28:33 UTC (rev 19711)
@@ -830,7 +830,6 @@
 				 int flag)
 {
 	int i = 0;
-	char *parm = NULL;
 	const char *parm_opt = NULL;
 	char *key = NULL;
 
@@ -855,9 +854,7 @@
 		if ((strncmp(argv[i], item, strlen(item)) == 0)) {
 			char *p;
 
-			parm = strdup(argv[i]);
-
-			if ( (p = strchr( parm, '=' )) == NULL) {
+			if ( (p = strchr( argv[i], '=' )) == NULL) {
 				_pam_log(LOG_INFO, "no \"=\" delimiter for \"%s\" found\n", item);
 				goto out;
 			}
@@ -870,7 +867,6 @@
 		_pam_log_debug(ctrl, LOG_INFO, "CONFIG file: %s '%s'\n", item, parm_opt);
 	}
 out:
-	SAFE_FREE(parm);
 	return parm_opt;
 }
 

Modified: branches/SAMBA_3_0_RELEASE/source/smbd/conn.c
===================================================================
--- branches/SAMBA_3_0_RELEASE/source/smbd/conn.c	2006-11-15 02:06:58 UTC (rev 19710)
+++ branches/SAMBA_3_0_RELEASE/source/smbd/conn.c	2006-11-15 05:28:33 UTC (rev 19711)
@@ -187,6 +187,7 @@
 		/* Update if connection wasn't idle. */
 		if (conn->lastused != conn->lastused_count) {
 			conn->lastused = t;
+			conn->lastused_count = t;
 		}
 
 		/* close dirptrs on connections that are idle */