s3:net: add --request-timeout option

metze

diff --git a/source3/utils/net.c b/source3/utils/net.c
index 7823a982195f232b45b5a7adef804c9f5dfd63e7..bd5107af5309ea7dd8104f32d80ec2e4a0fbbb39 100644 (file)
--- a/source3/utils/net.c
+++ b/source3/utils/net.c
@@ -651,6 +651,7 @@ static struct functable net_func[] = {
                {"force",       'f', POPT_ARG_NONE,   &c->opt_force},
                {"stdin",       'i', POPT_ARG_NONE,   &c->opt_stdin},
                {"timeout",     't', POPT_ARG_INT,    &c->opt_timeout},
+               {"request-timeout",0,POPT_ARG_INT,    &c->opt_request_timeout},
                {"machine-pass",'P', POPT_ARG_NONE,   &c->opt_machine_pass},
                {"kerberos",    'k', POPT_ARG_NONE,   &c->opt_kerberos},
                {"myworkgroup", 'W', POPT_ARG_STRING, &c->opt_workgroup},

diff --git a/source3/utils/net.h b/source3/utils/net.h
index 2d72756defbda1a593e8a768771e9beb2f9e2ee7..d88f962d41e6d8b1c5e7d6d325695c149e455cd4 100644 (file)
--- a/source3/utils/net.h
+++ b/source3/utils/net.h
@@ -43,6 +43,7 @@ struct net_context {
        const char *opt_container;
        int opt_flags;
        int opt_timeout;
+       int opt_request_timeout;
        const char *opt_target_workgroup;
        int opt_machine_pass;
        int opt_localgroup;

diff --git a/source3/utils/net_util.c b/source3/utils/net_util.c
index c6b6ee9e809d0b35a063f5ab64ec97cdc84832d7..2915ffb809449ce4ca9daf76d4096b5f95f95cb9 100644 (file)
--- a/source3/utils/net_util.c
+++ b/source3/utils/net_util.c
@@ -521,6 +521,8 @@ NTSTATUS net_make_ipc_connection_ex(struct net_context *c ,const char *domain,
                d_fprintf(stderr, "Connection failed: %s\n",
                          nt_errstr(nt_status));
                cli = NULL;
+       } else if (c->opt_request_timeout) {
+               cli_set_timeout(cli, c->opt_request_timeout * 1000);
        }
 
 done: