svn commit: samba r23601 - in branches: SAMBA_3_0/source/nsswitch SAMBA_3_0_25/source/nsswitch SAMBA_3_0_26/source/nsswitch

[jerry at samba.org]

Author: jerry
Date: 2007-06-26 00:52:19 +0000 (Tue, 26 Jun 2007)
New Revision: 23601

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23601

Log:
BUG 4579: Don't mark the SAM domain on a Samba DC as an internal domain or else all network connections from the local winbindd will fail
Modified:
   branches/SAMBA_3_0/source/nsswitch/winbindd_util.c
   branches/SAMBA_3_0_25/source/nsswitch/winbindd_util.c
   branches/SAMBA_3_0_26/source/nsswitch/winbindd_util.c


Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_util.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/winbindd_util.c	2007-06-25 20:17:04 UTC (rev 23600)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_util.c	2007-06-26 00:52:19 UTC (rev 23601)
@@ -82,6 +82,9 @@
 	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));
 }
 
@@ -90,6 +93,9 @@
 	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));
 }
 

Modified: branches/SAMBA_3_0_25/source/nsswitch/winbindd_util.c
===================================================================
--- branches/SAMBA_3_0_25/source/nsswitch/winbindd_util.c	2007-06-25 20:17:04 UTC (rev 23600)
+++ branches/SAMBA_3_0_25/source/nsswitch/winbindd_util.c	2007-06-26 00:52:19 UTC (rev 23601)
@@ -91,6 +91,9 @@
 	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));
 }
 
@@ -99,6 +102,9 @@
 	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));
 }
 

Modified: branches/SAMBA_3_0_26/source/nsswitch/winbindd_util.c
===================================================================
--- branches/SAMBA_3_0_26/source/nsswitch/winbindd_util.c	2007-06-25 20:17:04 UTC (rev 23600)
+++ branches/SAMBA_3_0_26/source/nsswitch/winbindd_util.c	2007-06-26 00:52:19 UTC (rev 23601)
@@ -91,6 +91,9 @@
 	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));
 }
 
@@ -99,6 +102,9 @@
 	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));
 }