Fix winbindd on a PDC by reverting : 83b04c60fac76ccd2d5aecb14f8896a07d488b1f..6e6651...

We still need to address https://bugzilla.redhat.com/show_bug.cgi?id=429024, but this
will come later.
Jeremy.

diff --git a/source/winbindd/winbindd_dual.c b/source/winbindd/winbindd_dual.c
index d46580155c0bd271eee558d79abcfad469b0f972..ae042563ed37b368797467563b9e3b5bb0f97c37 100644 (file)
--- a/source/winbindd/winbindd_dual.c
+++ b/source/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/source/winbindd/winbindd_util.c b/source/winbindd/winbindd_util.c
index ec97b49428c2276f65a9a86a46bf73611662083d..9008cf8122b5f1f4a4f4105cb100bc1a7214e6df 100644 (file)
--- a/source/winbindd/winbindd_util.c
+++ b/source/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));
 }