Revert "Introduce rpccli_set_timeout()"

This reverts commit 2e4c1ba38963cffe4c3f25ab24bc28975f2fc291.

diff --git a/source/rpc_client/cli_pipe.c b/source/rpc_client/cli_pipe.c
index 64fcc16bde38d469143653d499c50892ec2c77ed..3ef3f05cc6bdb36e169fdd36624764689c8e95a0 100644 (file)
--- a/source/rpc_client/cli_pipe.c
+++ b/source/rpc_client/cli_pipe.c
@@ -2173,12 +2173,6 @@ static NTSTATUS rpc_pipe_bind(struct rpc_pipe_client *cli,
        return NT_STATUS_OK;
 }
 
-unsigned int rpccli_set_timeout(struct rpc_pipe_client *cli,
-                               unsigned int timeout)
-{
-       return cli_set_timeout(cli->cli, timeout);
-}
-
 /****************************************************************************
  Open a named pipe over SMB to a remote server.
  *

diff --git a/source/rpcclient/cmd_netlogon.c b/source/rpcclient/cmd_netlogon.c
index 12d8cf305238168573bde1a1bf251564248b6169..a30dd740e2d3afc52306e6da073e4b7bce35cb8b 100644 (file)
--- a/source/rpcclient/cmd_netlogon.c
+++ b/source/rpcclient/cmd_netlogon.c
@@ -101,15 +101,14 @@ static WERROR cmd_netlogon_getanydcname(struct rpc_pipe_client *cli,
        }
 
        /* Make sure to wait for our DC's reply */
-       old_timeout = rpccli_set_timeout(cli, 30000); /* 30 seconds. */
-       rpccli_set_timeout(cli, MAX(old_timeout, 30000)); /* At least 30 sec */
+       old_timeout = cli_set_timeout(cli->cli, MAX(cli->cli->timeout,30000)); /* 30 seconds. */
 
        status = rpccli_netr_GetAnyDCName(cli, mem_ctx,
                                          cli->desthost,
                                          argv[1],
                                          &dcname,
                                          &werr);
-       rpccli_set_timeout(cli, old_timeout);
+       cli_set_timeout(cli->cli, old_timeout);
 
        if (!NT_STATUS_IS_OK(status)) {
                return ntstatus_to_werror(status);
@@ -141,15 +140,14 @@ static WERROR cmd_netlogon_getdcname(struct rpc_pipe_client *cli,
        }
 
        /* Make sure to wait for our DC's reply */
-       old_timeout = rpccli_set_timeout(cli, 30000); /* 30 seconds. */
-       rpccli_set_timeout(cli, MAX(30000, old_timeout)); /* At least 30 sec */
+       old_timeout = cli_set_timeout(cli->cli, MAX(cli->cli->timeout,30000)); /* 30 seconds. */
 
        status = rpccli_netr_GetDcName(cli, mem_ctx,
                                       cli->desthost,
                                       argv[1],
                                       &dcname,
                                       &werr);
-       rpccli_set_timeout(cli, old_timeout);
+       cli_set_timeout(cli->cli, old_timeout);
 
        if (!NT_STATUS_IS_OK(status)) {
                return ntstatus_to_werror(status);

diff --git a/source/rpcclient/cmd_samr.c b/source/rpcclient/cmd_samr.c
index cc92fef7e5636bf3a8312e44c833af9f2ad38fd1..5523d2ace2b240741292b07a1980871571c13d57 100644 (file)
--- a/source/rpcclient/cmd_samr.c
+++ b/source/rpcclient/cmd_samr.c
@@ -735,14 +735,13 @@ static NTSTATUS cmd_samr_query_groupmem(struct rpc_pipe_client *cli,
                goto done;
 
        /* Make sure to wait for our DC's reply */
-       old_timeout = rpccli_set_timeout(cli, 30000); /* 30 seconds. */
-       rpccli_set_timeout(cli, MAX(30000, old_timeout)); /* At least 30 sec */
+       old_timeout = cli_set_timeout(cli->cli, MAX(cli->cli->timeout,30000)); /* 30 seconds. */
 
        result = rpccli_samr_QueryGroupMember(cli, mem_ctx,
                                              &group_pol,
                                              &rids);
 
-       rpccli_set_timeout(cli, old_timeout);
+       cli_set_timeout(cli->cli, old_timeout);
 
        if (!NT_STATUS_IS_OK(result))
                goto done;

diff --git a/source/rpcclient/rpcclient.c b/source/rpcclient/rpcclient.c
index 8592e0a3b60ce6479db8a44df9c0d21badbfe79d..52dba2291be71614942f38cad75eddedaa49769b 100644 (file)
--- a/source/rpcclient/rpcclient.c
+++ b/source/rpcclient/rpcclient.c
@@ -420,7 +420,7 @@ static NTSTATUS cmd_timeout(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
                                        continue;
                                }
 
-                               rpccli_set_timeout(tmp_set->rpc_pipe, timeout);
+                               cli_set_timeout(tmp_set->rpc_pipe->cli, timeout);
                        }
                }
        }

diff --git a/source/winbindd/winbindd_cm.c b/source/winbindd/winbindd_cm.c
index ba682d9745b78c0245ce680f7002c0aea96ebea0..e000e2d118fc13eb3c62985b8911576f3092b5a7 100644 (file)
--- a/source/winbindd/winbindd_cm.c
+++ b/source/winbindd/winbindd_cm.c
@@ -598,7 +598,7 @@ static bool get_dc_name_via_netlogon(struct winbindd_domain *domain,
        /* This call can take a long time - allow the server to time out.
           35 seconds should do it. */
 
-       orig_timeout = rpccli_set_timeout(netlogon_pipe, 35000);
+       orig_timeout = cli_set_timeout(netlogon_pipe->cli, 35000);
 
        if (our_domain->active_directory) {
                struct netr_DsRGetDCNameInfo *domain_info = NULL;
@@ -638,7 +638,7 @@ static bool get_dc_name_via_netlogon(struct winbindd_domain *domain,
        }
 
        /* And restore our original timeout. */
-       rpccli_set_timeout(netlogon_pipe, orig_timeout);
+       cli_set_timeout(netlogon_pipe->cli, orig_timeout);
 
        if (!NT_STATUS_IS_OK(result)) {
                DEBUG(10,("rpccli_netr_GetAnyDCName failed: %s\n",

diff --git a/source/winbindd/winbindd_misc.c b/source/winbindd/winbindd_misc.c
index 8933cf27945d058dcd58af1807bb72cbaeecb6da..f63aa1689044770e7cf79323b53aadd8a6f6b6c2 100644 (file)
--- a/source/winbindd/winbindd_misc.c
+++ b/source/winbindd/winbindd_misc.c
@@ -343,7 +343,7 @@ enum winbindd_result winbindd_dual_getdcname(struct winbindd_domain *domain,
        /* This call can take a long time - allow the server to time out.
           35 seconds should do it. */
 
-       orig_timeout = rpccli_set_timeout(netlogon_pipe, 35000);
+       orig_timeout = cli_set_timeout(netlogon_pipe->cli, 35000);
 
        req_domain = find_domain_from_name_noinit(state->request.domain_name);
        if (req_domain == domain) {
@@ -362,7 +362,7 @@ enum winbindd_result winbindd_dual_getdcname(struct winbindd_domain *domain,
                                                  &werr);
        }
        /* And restore our original timeout. */
-       rpccli_set_timeout(netlogon_pipe, orig_timeout);
+       cli_set_timeout(netlogon_pipe->cli, orig_timeout);
 
        if (!NT_STATUS_IS_OK(result)) {
                DEBUG(5,("Error requesting DCname for domain %s: %s\n",

diff --git a/source/winbindd/winbindd_rpc.c b/source/winbindd/winbindd_rpc.c
index bb79d7ec1269a24d54a7ff91c46f6d23a099e3e0..2a7704c8a52ac65da0005201f8d081bfe75c43e4 100644 (file)
--- a/source/winbindd/winbindd_rpc.c
+++ b/source/winbindd/winbindd_rpc.c
@@ -750,14 +750,14 @@ static NTSTATUS lookup_groupmem(struct winbindd_domain *domain,
        /* This call can take a long time - allow the server to time out.
           35 seconds should do it. */
 
-       orig_timeout = rpccli_set_timeout(cli, 35000);
+       orig_timeout = cli_set_timeout(cli->cli, 35000);
 
         result = rpccli_samr_QueryGroupMember(cli, mem_ctx,
                                              &group_pol,
                                              &rids);
 
        /* And restore our original timeout. */
-       rpccli_set_timeout(cli, orig_timeout);
+       cli_set_timeout(cli->cli, orig_timeout);
 
        rpccli_samr_Close(cli, mem_ctx, &group_pol);