summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2007-06-26 00:52:19 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:23:35 -0500
commite1319eb0e8f9e5b53b5f535c6e55751922db90f6 (patch)
tree83bbc7da303cae9c96ac0bd59b53cef61720d8b7 /source3
parent133472ac668033c8d8153709c7b7ddaa235aa453 (diff)
downloadsamba-e1319eb0e8f9e5b53b5f535c6e55751922db90f6.tar.gz
samba-e1319eb0e8f9e5b53b5f535c6e55751922db90f6.tar.bz2
samba-e1319eb0e8f9e5b53b5f535c6e55751922db90f6.zip
r23601: 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
(This used to be commit 5e0f8b114b964d08cfb22a7452c617b8512545dc)
Diffstat (limited to 'source3')
-rw-r--r--source3/nsswitch/winbindd_util.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/source3/nsswitch/winbindd_util.c b/source3/nsswitch/winbindd_util.c
index 83d915429f..bf606c35c3 100644
--- a/source3/nsswitch/winbindd_util.c
+++ b/source3/nsswitch/winbindd_util.c
@@ -82,6 +82,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));
}
@@ -90,6 +93,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));
}