[SCM] Samba Shared Repository - branch v3-0-test updated - release-3-0-29-13-g0e407e7

[Jeremy Allison]

The branch, v3-0-test has been updated
       via  0e407e77ad5af4bb78b1e6da247398f2677618ee (commit)
      from  8f076ca8538df1fe7bba1e3c5497076141849e8c (commit)

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


- Log -----------------------------------------------------------------
commit 0e407e77ad5af4bb78b1e6da247398f2677618ee
Author: Jeremy Allison <jra at samba.org>
Date:   Thu May 29 10:38:59 2008 -0700

    Fix winbindd on a PDC by reverting : 83b04c60fac76ccd2d5aecb14f8896a07d488b1f..6e66512d5beb256a44c6703cdb8c7fa7e0fd8537.
    We still need to address https://bugzilla.redhat.com/show_bug.cgi?id=429024, but this
    will come later.
    Jeremy.

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

Summary of changes:
 source/nsswitch/winbindd_dual.c |   10 ----------
 source/nsswitch/winbindd_util.c |    6 ++++++
 2 files changed, 6 insertions(+), 10 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/nsswitch/winbindd_dual.c b/source/nsswitch/winbindd_dual.c
index 1d4d312..7176a25 100644
--- a/source/nsswitch/winbindd_dual.c
+++ b/source/nsswitch/winbindd_dual.c
@@ -35,7 +35,6 @@
 #define DBGC_CLASS DBGC_WINBIND
 
 extern BOOL override_logfile;
-extern struct winbindd_methods cache_methods;
 
 /* Read some data from a client connection */
 
@@ -993,15 +992,6 @@ static BOOL fork_domain_child(struct winbindd_child *child)
 			child);
 	}
 
-	/* Special case for Winbindd on a Samba DC,
-	 * We want to make sure the child can connect to smbd
-	 * but not the main daemon */
-
-	if (child->domain && child->domain->internal && IS_DC) {
-		child->domain->methods = &cache_methods;
-		child->domain->online = False;
-	}
-
 	while (1) {
 
 		int ret;
diff --git a/source/nsswitch/winbindd_util.c b/source/nsswitch/winbindd_util.c
index ecd919d..d2daf78 100644
--- a/source/nsswitch/winbindd_util.c
+++ b/source/nsswitch/winbindd_util.c
@@ -83,6 +83,9 @@ static BOOL is_internal_domain(const DOM_SID *sid)
 	if (sid == NULL)
 		return False;
 
+	if ( IS_DC )
+		return sid_check_is_builtin(sid);
+
 	return (sid_check_is_domain(sid) || sid_check_is_builtin(sid));
 }
 
@@ -91,6 +94,9 @@ static BOOL is_in_internal_domain(const DOM_SID *sid)
 	if (sid == NULL)
 		return False;
 
+	if ( IS_DC )
+		return sid_check_is_in_builtin(sid);
+
 	return (sid_check_is_in_our_domain(sid) || sid_check_is_in_builtin(sid));
 }
 


-- 
Samba Shared Repository