summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHerb Lewis <hlewis@panasas.com>2012-05-22 16:40:17 -0700
committerJeremy Allison <jra@samba.org>2012-05-23 03:49:35 +0200
commit42b2026a83983ad17bfd1651f2256b38e9fe8dad (patch)
tree6039d8918793fc7e118b088af4a44962f4329bf2
parentd6734029924e849dcd336728dde8d24141e8ccc3 (diff)
downloadsamba-42b2026a83983ad17bfd1651f2256b38e9fe8dad.tar.gz
samba-42b2026a83983ad17bfd1651f2256b38e9fe8dad.tar.bz2
samba-42b2026a83983ad17bfd1651f2256b38e9fe8dad.zip
Second part of fix for bug 8953 - winbind can hang as nbt_getdc() has no timeout.
If we're running with SEC_ADS and we don't get a cldap response from the server when querying its name, don't fall back to NetBIOS requests as they're unlikely to succeed. Signed-off-by: Jeremy Allison <jra@samba.org> Autobuild-User: Jeremy Allison <jra@samba.org> Autobuild-Date: Wed May 23 03:49:36 CEST 2012 on sn-devel-104
-rw-r--r--source3/winbindd/winbindd_cm.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
index cf1eb8bd0e..f36cceaccc 100644
--- a/source3/winbindd/winbindd_cm.c
+++ b/source3/winbindd/winbindd_cm.c
@@ -1158,6 +1158,7 @@ static bool dcip_to_name(TALLOC_CTX *mem_ctx,
}
ads_destroy( &ads );
+ return false;
}
#endif