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

Timestamp:

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

Author:

Herwig Bauernfeind

Message:

Update 3.2 to 3.2.12

Location:

branches/samba-3.2.x/source/utils

Files:

• net.c (modified) (3 diffs)
• net.h (modified) (1 diff)
• net_help.c (modified) (1 diff)
• net_rpc.c (modified) (8 diffs)

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

@@ -73 +73 @@
 int opt_flags = -1;
 int opt_timeout = 0;
+int opt_request_timeout = 0;
 const char *opt_target_workgroup = NULL;
 int opt_machine_pass = 0;
@@ -572 +573 @@
                           nt_errstr(nt_status));
                 cli = NULL;
+        } else if (opt_request_timeout) {
+                cli_set_timeout(cli, opt_request_timeout * 1000);
         }
 
@@ -1043 +1046 @@
                 {"stdin",       'i', POPT_ARG_NONE,   &opt_stdin},
                 {"timeout",     't', POPT_ARG_INT,    &opt_timeout},
+                {"request-timeout",0,POPT_ARG_INT,    &opt_request_timeout},
                 {"machine-pass",'P', POPT_ARG_NONE,   &opt_machine_pass},
                 {"myworkgroup", 'W', POPT_ARG_STRING, &opt_workgroup},

branches/samba-3.2.x/source/utils/net.h

@@ -101 +101 @@
 extern int opt_machine_pass;
 extern int opt_timeout;
+extern int opt_request_timeout;
 extern const char *opt_host;
 extern const char *opt_user_name;

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

@@ -49 +49 @@
         d_printf("\t-V or --version\t\t\tPrint samba version information\n");
         d_printf("\t-P or --machine-pass\t\tAuthenticate as machine account\n");
-        d_printf("\t-e or --encrypt\t\tEncrypt SMB transport (UNIX extended servers only)\n");
+        d_printf("\t-e or --encrypt\t\t\tEncrypt SMB transport (UNIX extended servers only)\n");
+        d_printf("\t--request-timeout\t\tThe timeout for smb and rpc requests in seconds\n");
         return -1;
 }

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;
 }