summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2008-03-27 13:00:23 +0100
committerVolker Lendecke <vl@samba.org>2008-03-27 13:11:10 +0100
commit2198058624d456e7434f5fbbb998cd232ea3e9e6 (patch)
tree5a3462ff37854e0960ddf36e37a9c59c22ea7621
parent9d9a9e2353b1aecbbc1f838ce9e68af7061e067b (diff)
downloadsamba-2198058624d456e7434f5fbbb998cd232ea3e9e6.tar.gz
samba-2198058624d456e7434f5fbbb998cd232ea3e9e6.tar.bz2
samba-2198058624d456e7434f5fbbb998cd232ea3e9e6.zip
Fix wbinfo -a trusted\\user%password on a Samba DC with trusts
Winbind can't be allowed to connect to the local smbd. (This used to be commit 0d617f639a3c9c52e4327aed4bd02d9e8e7312a2)
-rw-r--r--source3/winbindd/winbindd_cache.c5
-rw-r--r--source3/winbindd/winbindd_dual.c1
2 files changed, 5 insertions, 1 deletions
diff --git a/source3/winbindd/winbindd_cache.c b/source3/winbindd/winbindd_cache.c
index 4d81ee3960..a8a98e5bc8 100644
--- a/source3/winbindd/winbindd_cache.c
+++ b/source3/winbindd/winbindd_cache.c
@@ -37,6 +37,7 @@ extern bool opt_nocache;
#ifdef HAVE_ADS
extern struct winbindd_methods ads_methods;
#endif
+extern struct winbindd_methods passdb_methods;
/*
* JRA. KEEP THIS LIST UP TO DATE IF YOU ADD CACHE ENTRIES.
@@ -135,6 +136,10 @@ static struct winbind_cache *get_cache(struct winbindd_domain *domain)
/* We have to know what type of domain we are dealing with first. */
+ if (domain->internal) {
+ domain->backend = &passdb_methods;
+ domain->initialized = True;
+ }
if ( !domain->initialized ) {
init_dc_connection( domain );
}
diff --git a/source3/winbindd/winbindd_dual.c b/source3/winbindd/winbindd_dual.c
index 2b756b24d1..3c342e54a4 100644
--- a/source3/winbindd/winbindd_dual.c
+++ b/source3/winbindd/winbindd_dual.c
@@ -1089,7 +1089,6 @@ static bool fork_domain_child(struct winbindd_child *child)
* but not the main daemon */
if (child->domain && child->domain->internal && IS_DC) {
- child->domain->internal = False;
child->domain->methods = &cache_methods;
child->domain->online = False;
}