svn commit: samba r19348 - in branches: SAMBA_3_0/source/nsswitch SAMBA_3_0_23/source/nsswitch

[gd at samba.org]

Author: gd
Date: 2006-10-16 22:41:24 +0000 (Mon, 16 Oct 2006)
New Revision: 19348

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

Log:
Fix uninitialized dictionary handle, found by valgrind.

Guenther

Modified:
   branches/SAMBA_3_0/source/nsswitch/pam_winbind.c
   branches/SAMBA_3_0_23/source/nsswitch/pam_winbind.c


Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/pam_winbind.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/pam_winbind.c	2006-10-16 21:39:07 UTC (rev 19347)
+++ branches/SAMBA_3_0/source/nsswitch/pam_winbind.c	2006-10-16 22:41:24 UTC (rev 19348)
@@ -958,7 +958,7 @@
 	const char *member = NULL;
 	const char *cctype = NULL;
 	int retval = PAM_AUTH_ERR;
-	dictionary *d;
+	dictionary *d = NULL;
 	char *username_ret = NULL;
 
 	/* parse arguments */
@@ -1147,7 +1147,7 @@
 int pam_sm_close_session(pam_handle_t *pamh, int flags,
 			 int argc, const char **argv)
 {
-	dictionary *d;
+	dictionary *d = NULL;
 	int retval = PAM_SUCCESS;
 
 	/* parse arguments */
@@ -1241,7 +1241,7 @@
 	char *Announce;
 	
 	int retry = 0;
-	dictionary *d;
+	dictionary *d = NULL;
 
 	ctrl = _pam_parse(pamh, flags, argc, argv, &d);
 	if (ctrl == -1) {

Modified: branches/SAMBA_3_0_23/source/nsswitch/pam_winbind.c
===================================================================
--- branches/SAMBA_3_0_23/source/nsswitch/pam_winbind.c	2006-10-16 21:39:07 UTC (rev 19347)
+++ branches/SAMBA_3_0_23/source/nsswitch/pam_winbind.c	2006-10-16 22:41:24 UTC (rev 19348)
@@ -887,7 +887,7 @@
 	const char *member = NULL;
 	const char *cctype = NULL;
 	int retval = PAM_AUTH_ERR;
-	dictionary *d;
+	dictionary *d = NULL;
 
 	/* parse arguments */
 	int ctrl = _pam_parse(argc, argv, &d);
@@ -1068,7 +1068,7 @@
 int pam_sm_close_session(pam_handle_t *pamh, int flags,
 			 int argc, const char **argv)
 {
-	dictionary *d;
+	dictionary *d = NULL;
 	int retval = PAM_SUCCESS;
 
 	/* parse arguments */
@@ -1162,7 +1162,7 @@
 	char *Announce;
 	
 	int retry = 0;
-	dictionary *d;
+	dictionary *d = NULL;
 
 	ctrl = _pam_parse(argc, argv, &d);
 	if (ctrl == -1) {