r23601: BUG 4579: Don't mark the SAM domain on a Samba DC as an internal domain or...

[samba.git] / source3 / nsswitch / winbindd_util.c

diff --git a/source3/nsswitch/winbindd_util.c b/source3/nsswitch/winbindd_util.c
index 082ec4440b0d869edb01260c89b7b3bd8d25be12..bf606c35c3a89c9225ae3b496de0c1f684a620d4 100644 (file)
--- a/source3/nsswitch/winbindd_util.c
+++ b/source3/nsswitch/winbindd_util.c
@@ -56,7 +56,7 @@ struct winbindd_domain *domain_list(void)
        /* Initialise list */
 
        if ((!_domain_list) && (!init_domain_list())) {
-               smb_panic("Init_domain_list failed\n");
+               smb_panic("Init_domain_list failed");
        }
 
        return _domain_list;
@@ -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));
 }
 
@@ -857,7 +863,7 @@ struct winbindd_domain *find_our_domain(void)
                        return domain;
        }
 
-       smb_panic("Could not find our domain\n");
+       smb_panic("Could not find our domain");
        return NULL;
 }
 
@@ -882,8 +888,9 @@ struct winbindd_domain *find_builtin_domain(void)
        string_to_sid(&sid, "S-1-5-32");
        domain = find_domain_from_sid(&sid);
 
-       if (domain == NULL)
-               smb_panic("Could not find BUILTIN domain\n");
+       if (domain == NULL) {
+               smb_panic("Could not find BUILTIN domain");
+       }
 
        return domain;
 }