svn commit: samba r11320 - branches/SAMBA_3_0/source/rpc_client trunk/source/rpc_client

[vlendec at samba.org]

Author: vlendec
Date: 2005-10-27 08:27:48 +0000 (Thu, 27 Oct 2005)
New Revision: 11320

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

Log:
Fix error handling for rpccli_netlogon_getdcname. Jeremy, the other functions
in cli_netlogon look similarly suspicious.

Volker

Modified:
   branches/SAMBA_3_0/source/rpc_client/cli_netlogon.c
   trunk/source/rpc_client/cli_netlogon.c


Changeset:
Modified: branches/SAMBA_3_0/source/rpc_client/cli_netlogon.c
===================================================================
--- branches/SAMBA_3_0/source/rpc_client/cli_netlogon.c	2005-10-27 07:57:39 UTC (rev 11319)
+++ branches/SAMBA_3_0/source/rpc_client/cli_netlogon.c	2005-10-27 08:27:48 UTC (rev 11320)
@@ -387,7 +387,7 @@
 	prs_struct qbuf, rbuf;
 	NET_Q_GETDCNAME q;
 	NET_R_GETDCNAME r;
-	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
+	NTSTATUS result;
 
 	ZERO_STRUCT(q);
 	ZERO_STRUCT(r);
@@ -405,7 +405,7 @@
 		net_io_r_getdcname,
 		NT_STATUS_UNSUCCESSFUL);
 
-	if (NT_STATUS_IS_OK(result)) {
+	if (NT_STATUS_IS_OK(result = r.status)) {
 		rpcstr_pull_unistr2_fstring(newdcname, &r.uni_dcname);
 	}
 

Modified: trunk/source/rpc_client/cli_netlogon.c
===================================================================
--- trunk/source/rpc_client/cli_netlogon.c	2005-10-27 07:57:39 UTC (rev 11319)
+++ trunk/source/rpc_client/cli_netlogon.c	2005-10-27 08:27:48 UTC (rev 11320)
@@ -387,7 +387,7 @@
 	prs_struct qbuf, rbuf;
 	NET_Q_GETDCNAME q;
 	NET_R_GETDCNAME r;
-	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
+	NTSTATUS result;
 
 	ZERO_STRUCT(q);
 	ZERO_STRUCT(r);
@@ -405,7 +405,7 @@
 		net_io_r_getdcname,
 		NT_STATUS_UNSUCCESSFUL);
 
-	if (NT_STATUS_IS_OK(result)) {
+	if (NT_STATUS_IS_OK(result = r.status)) {
 		rpcstr_pull_unistr2_fstring(newdcname, &r.uni_dcname);
 	}