svn commit: samba r20917 - in branches: SAMBA_3_0/source/utils SAMBA_3_0_24/source/utils

[jra at samba.org]

Author: jra
Date: 2007-01-19 23:08:20 +0000 (Fri, 19 Jan 2007)
New Revision: 20917

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

Log:
Fix missing error returns pointed out by "Li, Ying (ESG)" <ying.li2 at hp.com>
Jeremy.

Modified:
   branches/SAMBA_3_0/source/utils/net_rpc.c
   branches/SAMBA_3_0_24/source/utils/net_rpc.c


Changeset:
Modified: branches/SAMBA_3_0/source/utils/net_rpc.c
===================================================================
--- branches/SAMBA_3_0/source/utils/net_rpc.c	2007-01-19 21:46:12 UTC (rev 20916)
+++ branches/SAMBA_3_0/source/utils/net_rpc.c	2007-01-19 23:08:20 UTC (rev 20917)
@@ -5545,6 +5545,7 @@
 	if (NT_STATUS_IS_ERR(nt_status)) {
 		DEBUG(0, ("Couldn't connect to domain %s controller. Error was %s.\n",
 			domain_name, nt_errstr(nt_status)));
+		return -1;
 	}
 
 	/*
@@ -5554,6 +5555,8 @@
 	if (!cli_get_pdc_name(cli, domain_name, (char*)pdc_name)) {
 		DEBUG(0, ("NetServerEnum2 error: Couldn't find primary domain controller\
 			 for domain %s\n", domain_name));
+		cli_shutdown(cli);
+		return -1;
 	}
 	 
 	if (!(mem_ctx = talloc_init("establishing trust relationship to "

Modified: branches/SAMBA_3_0_24/source/utils/net_rpc.c
===================================================================
--- branches/SAMBA_3_0_24/source/utils/net_rpc.c	2007-01-19 21:46:12 UTC (rev 20916)
+++ branches/SAMBA_3_0_24/source/utils/net_rpc.c	2007-01-19 23:08:20 UTC (rev 20917)
@@ -5654,6 +5654,7 @@
 	if (NT_STATUS_IS_ERR(nt_status)) {
 		DEBUG(0, ("Couldn't connect to domain %s controller. Error was %s.\n",
 			domain_name, nt_errstr(nt_status)));
+		return -1;
 	}
 
 	/*
@@ -5663,6 +5664,8 @@
 	if (!cli_get_pdc_name(cli, domain_name, (char*)pdc_name)) {
 		DEBUG(0, ("NetServerEnum2 error: Couldn't find primary domain controller\
 			 for domain %s\n", domain_name));
+		cli_shutdown(cli);
+		return -1;
 	}
 	 
 	if (!(mem_ctx = talloc_init("establishing trust relationship to "