svn commit: samba r13232 - branches/SAMBA_3_0/source/nsswitch branches/SAMBA_3_0_RELEASE/source/nsswitch trunk/source/nsswitch

[jerry at samba.org]

Author: jerry
Date: 2006-01-30 17:47:24 +0000 (Mon, 30 Jan 2006)
New Revision: 13232

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

Log:
defensive programming in an attempt to prevent crashes due to a PDC rebooting
Modified:
   branches/SAMBA_3_0/source/nsswitch/winbindd_cm.c
   branches/SAMBA_3_0_RELEASE/source/nsswitch/winbindd_cm.c
   trunk/source/nsswitch/winbindd_cm.c


Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_cm.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/winbindd_cm.c	2006-01-30 17:42:42 UTC (rev 13231)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_cm.c	2006-01-30 17:47:24 UTC (rev 13232)
@@ -101,8 +101,8 @@
 static BOOL get_dc_name_via_netlogon(const struct winbindd_domain *domain,
 				     fstring dcname, struct in_addr *dc_ip)
 {
-	struct winbindd_domain *our_domain;
-	struct rpc_pipe_client *netlogon_pipe;
+	struct winbindd_domain *our_domain = NULL;
+	struct rpc_pipe_client *netlogon_pipe = NULL;
 	NTSTATUS result;
 	TALLOC_CTX *mem_ctx;
 
@@ -1306,8 +1306,10 @@
 	uint8  mach_pwd[16];
 	uint32  sec_chan_type;
 	const char *account_name;
-	struct rpc_pipe_client *netlogon_pipe;
+	struct rpc_pipe_client *netlogon_pipe = NULL;
 
+	*cli = NULL;
+
 	result = init_dc_connection(domain);
 	if (!NT_STATUS_IS_OK(result)) {
 		return result;

Modified: branches/SAMBA_3_0_RELEASE/source/nsswitch/winbindd_cm.c
===================================================================
--- branches/SAMBA_3_0_RELEASE/source/nsswitch/winbindd_cm.c	2006-01-30 17:42:42 UTC (rev 13231)
+++ branches/SAMBA_3_0_RELEASE/source/nsswitch/winbindd_cm.c	2006-01-30 17:47:24 UTC (rev 13232)
@@ -101,8 +101,8 @@
 static BOOL get_dc_name_via_netlogon(const struct winbindd_domain *domain,
 				     fstring dcname, struct in_addr *dc_ip)
 {
-	struct winbindd_domain *our_domain;
-	struct rpc_pipe_client *netlogon_pipe;
+	struct winbindd_domain *our_domain = NULL;
+	struct rpc_pipe_client *netlogon_pipe = NULL;
 	NTSTATUS result;
 	TALLOC_CTX *mem_ctx;
 
@@ -1306,8 +1306,10 @@
 	uint8  mach_pwd[16];
 	uint32  sec_chan_type;
 	const char *account_name;
-	struct rpc_pipe_client *netlogon_pipe;
+	struct rpc_pipe_client *netlogon_pipe = NULL;
 
+	*cli = NULL;
+
 	result = init_dc_connection(domain);
 	if (!NT_STATUS_IS_OK(result)) {
 		return result;

Modified: trunk/source/nsswitch/winbindd_cm.c
===================================================================
--- trunk/source/nsswitch/winbindd_cm.c	2006-01-30 17:42:42 UTC (rev 13231)
+++ trunk/source/nsswitch/winbindd_cm.c	2006-01-30 17:47:24 UTC (rev 13232)
@@ -101,8 +101,8 @@
 static BOOL get_dc_name_via_netlogon(const struct winbindd_domain *domain,
 				     fstring dcname, struct in_addr *dc_ip)
 {
-	struct winbindd_domain *our_domain;
-	struct rpc_pipe_client *netlogon_pipe;
+	struct winbindd_domain *our_domain = NULL;
+	struct rpc_pipe_client *netlogon_pipe = NULL;
 	NTSTATUS result;
 	TALLOC_CTX *mem_ctx;
 
@@ -1322,8 +1322,10 @@
 	uint8  mach_pwd[16];
 	uint32  sec_chan_type;
 	const char *account_name;
-	struct rpc_pipe_client *netlogon_pipe;
+	struct rpc_pipe_client *netlogon_pipe = NULL;
 
+	*cli = NULL;
+
 	result = init_dc_connection(domain);
 	if (!NT_STATUS_IS_OK(result)) {
 		return result;