[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-1670-gdcd42a1

[Michael Adam]

The branch, v3-2-test has been updated
       via  dcd42a1e0642c69348adfaeecef7f7f2f074ac30 (commit)
      from  d5ebfccebb1f1b56b45673a506fcdb414103c43b (commit)

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


- Log -----------------------------------------------------------------
commit dcd42a1e0642c69348adfaeecef7f7f2f074ac30
Author: Michael Adam <obnox at samba.org>
Date:   Fri Jan 25 16:40:17 2008 +0100

    Fix winbindd_can_contact_domain() on a samba DC.
    
    The check for inbound trusts is invalid when samba is a DC
    and has a trust with an active directory domain.
    
    This effectively prevented tusts with an AD domain on a
    samba DC from working (unless using "winbindd rpc only"),
    because an ads_connect() was never performed. Only the
    rpc-based winbindd methods were working properly.
    
    Jerry: Please check!
    
    Michael

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

Summary of changes:
 source/winbindd/winbindd_util.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/winbindd/winbindd_util.c b/source/winbindd/winbindd_util.c
index 3d9ede3..d16b742 100644
--- a/source/winbindd/winbindd_util.c
+++ b/source/winbindd/winbindd_util.c
@@ -1398,10 +1398,13 @@ bool winbindd_can_contact_domain( struct winbindd_domain *domain )
 	if ( domain->domain_flags & DS_DOMAIN_IN_FOREST )
 		return True;	
 
-	/* We cannot contact the domain if it is running AD and
-	   we have no inbound trust */
+	/*
+	 * On a _member_ server, we cannot contact the domain if it
+	 * is running AD and we have no inbound trust.
+	 */
 
-	if ( domain->active_directory && 
+	if ( !IS_DC &&
+	     domain->active_directory &&
 	     ((domain->domain_flags&DS_DOMAIN_DIRECT_INBOUND) != DS_DOMAIN_DIRECT_INBOUND) ) 
 	{
 		DEBUG(10, ("Domain is an AD domain and we have no inbound "


-- 
Samba Shared Repository