diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2009-04-20 16:53:02 +0200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2009-04-20 16:53:02 +0200 |
| commit | 6c9caed48187a0d18becf59ab636af44cbe521b0 (patch) | |
| tree | c47170169077be6f8ae60aed739803ab4ba861b7 /source3/utils/net_util.c | |
| parent | 53765c81f726a8c056cc4e57004592dd489975c9 (diff) | |
| parent | 31120c9eacafd93e0f2c6b0f906af21adadd318a (diff) | |
| download | samba-6c9caed48187a0d18becf59ab636af44cbe521b0.tar.gz samba-6c9caed48187a0d18becf59ab636af44cbe521b0.tar.bz2 samba-6c9caed48187a0d18becf59ab636af44cbe521b0.zip | |
Merge commit 'origin/master' into libcli-auth-merge-without-netlogond
Diffstat (limited to 'source3/utils/net_util.c')
| -rw-r--r-- | source3/utils/net_util.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source3/utils/net_util.c b/source3/utils/net_util.c index c6b6ee9e80..2915ffb809 100644 --- 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: |