From: Volker Lendecke <vl@samba.org>
Date: Thu, 27 Mar 2008 12:00:23 +0000 (+0100)
Subject: Fix wbinfo -a trusted\\user%password on a Samba DC with trusts
X-Git-Tag: samba-3.3.0pre1~3075
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0d617f639a3c9c52e4327aed4bd02d9e8e7312a2;p=thirdparty%2Fsamba.git

Fix wbinfo -a trusted\\user%password on a Samba DC with trusts

Winbind can't be allowed to connect to the local smbd.
---

diff --git a/source/winbindd/winbindd_cache.c b/source/winbindd/winbindd_cache.c
index 4d81ee39600..a8a98e5bc87 100644
--- a/source/winbindd/winbindd_cache.c
+++ b/source/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/source/winbindd/winbindd_dual.c b/source/winbindd/winbindd_dual.c
index 2b756b24d17..3c342e54a47 100644
--- a/source/winbindd/winbindd_dual.c
+++ b/source/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;
 	}