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.
(This used to be commit 1c1f710e3e2e222c9d91a5650844c1db5ebd5a3a)

diff --git a/source3/nsswitch/winbindd_cache.c b/source3/nsswitch/winbindd_cache.c
index f9b045e10cb44e7b610455560cd86658424a692f..475f068f9be274fac8b175a868f4df9d1d56ee5c 100644 (file)
--- a/source3/nsswitch/winbindd_cache.c
+++ b/source3/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 {