From: Volker Lendecke <vlendec@samba.org>
Date: Fri, 1 Jun 2007 18:39:50 +0000 (+0000)
Subject: r23297: This introduces the winbind:ads parameter which defaults to True. Setting it
X-Git-Tag: samba-misc-tags/initial-v3-0-unstable~295
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1c1f710e3e2e222c9d91a5650844c1db5ebd5a3a;p=thirdparty%2Fsamba.git

r23297: This introduces the winbind:ads parameter which defaults to True. Setting it
to False makes winbind use RPC and not LDAP methods to connect to the DCs,
even when it figured out they are AD.
---

diff --git a/source/nsswitch/winbindd_cache.c b/source/nsswitch/winbindd_cache.c
index f9b045e10cb..475f068f9be 100644
--- a/source/nsswitch/winbindd_cache.c
+++ b/source/nsswitch/winbindd_cache.c
@@ -169,7 +169,9 @@ static struct winbind_cache *get_cache(struct winbindd_domain *domain)
 		if ( !domain->primary )
 			our_domain = find_our_domain();
 
-		if ( (our_domain->active_directory || IS_DC) && domain->active_directory ) {
+		if ((our_domain->active_directory || IS_DC)
+		    && domain->active_directory
+		    && lp_parm_bool(-1, "winbind", "ads", True)) {
 			DEBUG(5,("get_cache: Setting ADS methods for domain %s\n", domain->name));
 			domain->backend = &ads_methods;
 		} else {