summaryrefslogtreecommitdiff
path: root/source3/rpcclient/cmd_netlogon.c
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2006-10-16 23:27:38 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:15:30 -0500
commitfb183ebd9207cac7b98aff9f672c06b0b50609ce (patch)
tree4e907f72bc55b4f340deb49cba39be60606fad76 /source3/rpcclient/cmd_netlogon.c
parentb26b8f95e95030506189d714ac62380788a5fe3e (diff)
downloadsamba-fb183ebd9207cac7b98aff9f672c06b0b50609ce.tar.gz
samba-fb183ebd9207cac7b98aff9f672c06b0b50609ce.tar.bz2
samba-fb183ebd9207cac7b98aff9f672c06b0b50609ce.zip
r19353: Add "timeout" command for rpcclient.
Guenther (This used to be commit 4106a56d3f4edb2e07e876204743a1cb028c950a)
Diffstat (limited to 'source3/rpcclient/cmd_netlogon.c')
-rw-r--r--source3/rpcclient/cmd_netlogon.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/rpcclient/cmd_netlogon.c b/source3/rpcclient/cmd_netlogon.c
index 5ae449a68c..a1093d693f 100644
--- a/source3/rpcclient/cmd_netlogon.c
+++ b/source3/rpcclient/cmd_netlogon.c
@@ -59,7 +59,7 @@ static WERROR cmd_netlogon_getdcname(struct rpc_pipe_client *cli,
}
/* Make sure to wait for our DC's reply */
- old_timeout = cli_set_timeout(cli->cli, 30000); /* 30 seconds. */
+ old_timeout = cli_set_timeout(cli->cli, MAX(cli->cli->timeout,30000)); /* 30 seconds. */
result = rpccli_netlogon_getdcname(cli, mem_ctx, cli->cli->desthost, argv[1], dcname);
@@ -90,7 +90,7 @@ static WERROR cmd_netlogon_getanydcname(struct rpc_pipe_client *cli,
}
/* Make sure to wait for our DC's reply */
- old_timeout = cli_set_timeout(cli->cli, 30000); /* 30 seconds. */
+ old_timeout = cli_set_timeout(cli->cli, MAX(cli->cli->timeout,30000)); /* 30 seconds. */
result = rpccli_netlogon_getanydcname(cli, mem_ctx, cli->cli->desthost, argv[1], dcname);