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/nsswitch/winbindd_cache.c b/source/nsswitch/winbindd_cache.c
index a88a061686c7fb06432cfa645269ed33f4ad4b3b..42f5565854940c17d221950a44c7fb8b09246a87 100644 (file)
--- 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 fa6add3aab3778bc1bdec5c3de4a75afe63488d2..7df630d6f93e56ed69ffde50f3d344f787b3c7fc 100644 (file)
--- 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;
        }