Changeset 224 for branches/samba-3.3.x/source/utils/net_rpc.c

Timestamp:

May 24, 2009, 7:55:48 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3 branch to 3.3.4

File:

• branches/samba-3.3.x/source/utils/net_rpc.c (modified) (9 diffs)

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

@@ -121 +121 @@
         DOM_SID *domain_sid;
         const char *domain_name;
+        int ret = -1;
 
         /* make use of cli_state handed over as an argument, if possible */
@@ -142 +143 @@
         if (!(mem_ctx = talloc_init("run_rpc_command"))) {
                 DEBUG(0, ("talloc_init() failed\n"));
-                cli_shutdown(cli);
-                return -1;
+                goto fail;
         }
 
@@ -149 +149 @@
                                               &domain_name);
         if (!NT_STATUS_IS_OK(nt_status)) {
-                cli_shutdown(cli);
-                return -1;
+                goto fail;
         }
 
@@ -165 +164 @@
                                 DEBUG(0, ("Could not initialise schannel netlogon pipe. Error was %s\n",
                                         nt_errstr(nt_status) ));
-                                cli_shutdown(cli);
-                                return -1;
+                                goto fail;
                         }
                 } else {
@@ -185 +183 @@
                                                 debug_ctx(), cli, interface),
                                         nt_errstr(nt_status) ));
-                                cli_shutdown(cli);
-                                return -1;
+                                goto fail;
                         }
                 }
@@ -196 +193 @@
                 DEBUG(1, ("rpc command function failed! (%s)\n", nt_errstr(nt_status)));
         } else {
+                ret = 0;
                 DEBUG(5, ("rpc command function succedded\n"));
         }
@@ -205 +203 @@
         }
 
+fail:
         /* close the connection only if it was opened here */
         if (!cli_arg) {
@@ -211 +210 @@
 
         talloc_destroy(mem_ctx);
-        return (!NT_STATUS_IS_OK(nt_status));
+        return ret;
 }
 
@@ -6128 +6127 @@
         nt_status = rpccli_samr_Connect2(pipe_hnd, mem_ctx,
                                          pipe_hnd->desthost,
-                                         SAMR_ACCESS_OPEN_DOMAIN,
+                                         SAMR_ACCESS_LOOKUP_DOMAIN,
                                          &connect_hnd);
         if (!NT_STATUS_IS_OK(nt_status)) {