summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2007-06-01 18:39:50 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:23:03 -0500
commita7efef4d094f5f90d7c9a7cf70592367875443de (patch)
treecb460a9b50fddbb0b6bd96174491815d8d2c8130
parentaded04816085ad1911582c9037f26ad9aa9fc24e (diff)
downloadsamba-a7efef4d094f5f90d7c9a7cf70592367875443de.tar.gz
samba-a7efef4d094f5f90d7c9a7cf70592367875443de.tar.bz2
samba-a7efef4d094f5f90d7c9a7cf70592367875443de.zip
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)
-rw-r--r--source3/nsswitch/winbindd_cache.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source3/nsswitch/winbindd_cache.c b/source3/nsswitch/winbindd_cache.c
index f9b045e10c..475f068f9b 100644
--- 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 {