Changeset 272 for branches/samba-3.2.x/source/utils/net_rpc.c

Timestamp:

Jun 16, 2009, 5:52:30 PM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 to 3.2.12

File:

• branches/samba-3.2.x/source/utils/net_rpc.c (modified) (8 diffs)

branches/samba-3.2.x/source/utils/net_rpc.c

@@ -119 +119 @@
         DOM_SID *domain_sid;
         const char *domain_name;
+        int ret = -1;
 
         /* make use of cli_state handed over as an argument, if possible */
@@ -140 +141 @@
         if (!(mem_ctx = talloc_init("run_rpc_command"))) {
                 DEBUG(0, ("talloc_init() failed\n"));
-                cli_shutdown(cli);
-                return -1;
+                goto fail;
         }
         
@@ -147 +147 @@
                                               &domain_name);
         if (!NT_STATUS_IS_OK(nt_status)) {
-                cli_shutdown(cli);
-                return -1;
+                goto fail;
         }
 
@@ -161 +160 @@
                                 DEBUG(0, ("Could not initialise schannel netlogon pipe. Error was %s\n",
                                         nt_errstr(nt_status) ));
-                                cli_shutdown(cli);
-                                return -1;
+                                goto fail;
                         }
                 } else {
@@ -170 +168 @@
                                         cli_get_pipe_name(pipe_idx),
                                         nt_errstr(nt_status) ));
-                                cli_shutdown(cli);
-                                return -1;
+                                goto fail;
                         }
                 }
@@ -181 +178 @@
                 DEBUG(1, ("rpc command function failed! (%s)\n", nt_errstr(nt_status)));
         } else {
+                ret = 0;
                 DEBUG(5, ("rpc command function succedded\n"));
         }
@@ -190 +188 @@
         }
 
+fail:
         /* close the connection only if it was opened here */
         if (!cli_arg) {
@@ -196 +195 @@
         
         talloc_destroy(mem_ctx);
-        return (!NT_STATUS_IS_OK(nt_status));
+        return ret;
 }