summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Peach <jpeach@samba.org>2007-06-02 21:12:47 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:23:05 -0500
commit4a76fa88b498ada37191e69056e34a8e975a14ea (patch)
tree8bcfe7246725fefd6dac42706efff5f8c5c8f92f
parente893d7f021d149803aa85e347e0a8acefde210ac (diff)
downloadsamba-4a76fa88b498ada37191e69056e34a8e975a14ea.tar.gz
samba-4a76fa88b498ada37191e69056e34a8e975a14ea.tar.bz2
samba-4a76fa88b498ada37191e69056e34a8e975a14ea.zip
r23312: As per Volker, rename the "windbind:ads" parameter "winbind:rpc only".
(This used to be commit cbd083efb9a00db68be24cde10b96da06390d970)
-rw-r--r--source3/nsswitch/winbindd_cache.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/source3/nsswitch/winbindd_cache.c b/source3/nsswitch/winbindd_cache.c
index 475f068f9b..aac0ef21b3 100644
--- a/source3/nsswitch/winbindd_cache.c
+++ b/source3/nsswitch/winbindd_cache.c
@@ -133,9 +133,6 @@ void winbindd_check_cache_size(time_t t)
static struct winbind_cache *get_cache(struct winbindd_domain *domain)
{
struct winbind_cache *ret = wcache;
-#ifdef HAVE_ADS
- struct winbindd_domain *our_domain = domain;
-#endif
/* We have to know what type of domain we are dealing with first. */
@@ -163,6 +160,8 @@ static struct winbind_cache *get_cache(struct winbindd_domain *domain)
if (!domain->backend) {
#ifdef HAVE_ADS
+ struct winbindd_domain *our_domain = domain;
+
/* find our domain first so we can figure out if we
are joined to a kerberized domain */
@@ -171,7 +170,7 @@ static struct winbind_cache *get_cache(struct winbindd_domain *domain)
if ((our_domain->active_directory || IS_DC)
&& domain->active_directory
- && lp_parm_bool(-1, "winbind", "ads", True)) {
+ && !lp_parm_bool(-1, "winbind", "rpc only", False)) {
DEBUG(5,("get_cache: Setting ADS methods for domain %s\n", domain->name));
domain->backend = &ads_methods;
} else {