[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-473-g0d617f6

[Volker Lendecke]

The branch, v3-2-test has been updated
       via  0d617f639a3c9c52e4327aed4bd02d9e8e7312a2 (commit)
      from  7eb4f6f6f9f27cda3d512f4042e36d70d0b26b6b (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 0d617f639a3c9c52e4327aed4bd02d9e8e7312a2
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Mar 27 13:00:23 2008 +0100

    Fix wbinfo -a trusted\\user%password on a Samba DC with trusts
    
    Winbind can't be allowed to connect to the local smbd.

-----------------------------------------------------------------------

Summary of changes:
 source/winbindd/winbindd_cache.c |    5 +++++
 source/winbindd/winbindd_dual.c  |    1 -
 2 files changed, 5 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/winbindd/winbindd_cache.c b/source/winbindd/winbindd_cache.c
index 4d81ee3..a8a98e5 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 2b756b2..3c342e5 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;
 	}


-- 
Samba Shared Repository