summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2008-05-29 10:37:52 -0700
committerJeremy Allison <jra@samba.org>2008-05-29 10:37:52 -0700
commit433a05c1abfa4f67bbbb4633db69ba7e01921800 (patch)
treeb9ad0c5df98e952396b321fc0e0af46335d970ab
parentd36434f31268b75040311352f23c92c9a61e8cda (diff)
downloadsamba-433a05c1abfa4f67bbbb4633db69ba7e01921800.tar.gz
samba-433a05c1abfa4f67bbbb4633db69ba7e01921800.tar.bz2
samba-433a05c1abfa4f67bbbb4633db69ba7e01921800.zip
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. (This used to be commit 41e20becf3b976656f60aaec9175df329803b012)
-rw-r--r--source3/winbindd/winbindd_dual.c9
-rw-r--r--source3/winbindd/winbindd_util.c6
2 files changed, 6 insertions, 9 deletions
diff --git a/source3/winbindd/winbindd_dual.c b/source3/winbindd/winbindd_dual.c
index d46580155c..ae042563ed 100644
--- a/source3/winbindd/winbindd_dual.c
+++ b/source3/winbindd/winbindd_dual.c
@@ -1087,15 +1087,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/source3/winbindd/winbindd_util.c b/source3/winbindd/winbindd_util.c
index ec97b49428..9008cf8122 100644
--- a/source3/winbindd/winbindd_util.c
+++ b/source3/winbindd/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));
}