[SCM] Samba Shared Repository - branch v3-0-test updated - release-3-0-28a-12-gbddd962

[Volker Lendecke]

The branch, v3-0-test has been updated
       via  bddd96297948e5405415275da00dc673f17c0d48 (commit)
      from  9b5ed88d4ae6885bc70f7c9ef4f10c381af7260e (commit)

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


- Log -----------------------------------------------------------------
commit bddd96297948e5405415275da00dc673f17c0d48
Author: Volker Lendecke <vl at samba.org>
Date:   Wed Mar 26 17:45:27 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/nsswitch/winbindd_cache.c |    5 +++++
 source/nsswitch/winbindd_dual.c  |    1 -
 2 files changed, 5 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/nsswitch/winbindd_cache.c b/source/nsswitch/winbindd_cache.c
index a88a061..42f5565 100644
--- a/source/nsswitch/winbindd_cache.c
+++ b/source/nsswitch/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.
@@ -136,6 +137,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/nsswitch/winbindd_dual.c b/source/nsswitch/winbindd_dual.c
index fa6add3..7df630d 100644
--- a/source/nsswitch/winbindd_dual.c
+++ b/source/nsswitch/winbindd_dual.c
@@ -994,7 +994,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