summaryrefslogtreecommitdiff
path: root/source3/winbindd
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2011-04-17 20:16:07 +0200
committerVolker Lendecke <vl@samba.org>2011-04-25 09:50:32 +0200
commit23a6af46c84cd9b738af403d80c5187d858eac03 (patch)
tree22dc5bca73c8bf14b5e7be550e65a8d9de3520c8 /source3/winbindd
parentf7bc84409a7a6736ec2cf1110dd7200a954e3b7e (diff)
downloadsamba-23a6af46c84cd9b738af403d80c5187d858eac03.tar.gz
samba-23a6af46c84cd9b738af403d80c5187d858eac03.tar.bz2
samba-23a6af46c84cd9b738af403d80c5187d858eac03.zip
s3: Add a 10-second timeout for the 445 or netbios connection to a DC
Diffstat (limited to 'source3/winbindd')
-rw-r--r--source3/winbindd/winbindd_cm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
index 3a701b9c0e..166e2eda52 100644
--- a/source3/winbindd/winbindd_cm.c
+++ b/source3/winbindd/winbindd_cm.c
@@ -1375,7 +1375,7 @@ static bool find_new_dc(TALLOC_CTX *mem_ctx,
return False;
status = smbsock_any_connect(addrs, dcnames, NULL, NULL, NULL,
- num_addrs, 0, fd, &fd_index, NULL);
+ num_addrs, 0, 10, fd, &fd_index, NULL);
if (!NT_STATUS_IS_OK(status)) {
for (i=0; i<num_dcs; i++) {
char ab[INET6_ADDRSTRLEN];
@@ -1571,7 +1571,7 @@ static NTSTATUS cm_open_connection(struct winbindd_domain *domain,
status = smbsock_connect(&domain->dcaddr, 0,
NULL, -1, NULL, -1,
- &fd, NULL);
+ &fd, NULL, 10);
if (!NT_STATUS_IS_OK(status)) {
fd = -1;
}