r20917: Fix missing error returns pointed out by "Li, Ying (ESG)" <ying.li2@hp.com>
authorJeremy Allison <jra@samba.org>
Fri, 19 Jan 2007 23:08:20 +0000 (23:08 +0000)
committerGerald (Jerry) Carter <jerry@samba.org>
Wed, 10 Oct 2007 17:17:20 +0000 (12:17 -0500)
Jeremy.
(This used to be commit 78387b3cd2e4eff8f09b6c498ca37b016ed9ecbc)

source3/utils/net_rpc.c

index 29fba09eb726b035af07c7091fdf2329b3550c96..94708ad2ccff4d9ae789d54fde48cf4105fa53ce 100644 (file)
@@ -5545,6 +5545,7 @@ static int rpc_trustdom_establish(int argc, const char **argv)
        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 @@ static int rpc_trustdom_establish(int argc, const char **argv)
        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 "