svn commit: samba r15973 - in trunk/source: auth libsmb

[jra at samba.org]

Author: jra
Date: 2006-05-30 23:12:11 +0000 (Tue, 30 May 2006)
New Revision: 15973

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

Log:
Should fix Coverity #295 - it gets confused as
we don't null out cli.
Jeremy.

Modified:
   trunk/source/auth/auth_domain.c
   trunk/source/libsmb/cliconnect.c


Changeset:
Modified: trunk/source/auth/auth_domain.c
===================================================================
--- trunk/source/auth/auth_domain.c	2006-05-30 23:08:37 UTC (rev 15972)
+++ trunk/source/auth/auth_domain.c	2006-05-30 23:12:11 UTC (rev 15973)
@@ -50,6 +50,8 @@
         NTSTATUS result;
 	struct rpc_pipe_client *netlogon_pipe = NULL;
 
+	*cli = NULL;
+
 	*pipe_ret = NULL;
 
 	/* TODO: Send a SAMLOGON request to determine whether this is a valid
@@ -81,6 +83,11 @@
 			result = NT_STATUS_NO_LOGON_SERVERS;
 		}
 
+		if (*cli) {
+			cli_shutdown(*cli);
+			*cli = NULL;
+		}
+
 		release_server_mutex();
 		return result;
 	}
@@ -111,6 +118,7 @@
 		DEBUG(0,("connect_to_domain_password_server: unable to open the domain client session to \
 machine %s. Error was : %s.\n", dc_name, nt_errstr(result)));
 		cli_shutdown(*cli);
+		*cli = NULL;
 		release_server_mutex();
 		return result;
 	}
@@ -126,6 +134,7 @@
 			"trust account password for domain '%s'\n",
 				domain));
 			cli_shutdown(*cli);
+			*cli = NULL;
 			release_server_mutex();
 			return NT_STATUS_CANT_ACCESS_DOMAIN_INFO;
 		}
@@ -141,6 +150,7 @@
 
 		if (!NT_STATUS_IS_OK(result)) {
 			cli_shutdown(*cli);
+			*cli = NULL;
 			release_server_mutex();
 			return result;
 		}
@@ -150,6 +160,7 @@
 		DEBUG(0,("connect_to_domain_password_server: unable to open the domain client session to \
 machine %s. Error was : %s.\n", dc_name, cli_errstr(*cli)));
 		cli_shutdown(*cli);
+		*cli = NULL;
 		release_server_mutex();
 		return NT_STATUS_NO_LOGON_SERVERS;
 	}

Modified: trunk/source/libsmb/cliconnect.c
===================================================================
--- trunk/source/libsmb/cliconnect.c	2006-05-30 23:08:37 UTC (rev 15972)
+++ trunk/source/libsmb/cliconnect.c	2006-05-30 23:12:11 UTC (rev 15973)
@@ -1496,6 +1496,8 @@
 	struct cli_state *cli = NULL;
 	int pw_len = password ? strlen(password)+1 : 0;
 
+	*output_cli = NULL;
+
 	if (password == NULL) {
 		password = "";
 	}