r914: Fix from "Jerome Borsboom" <j.borsboom@erasmusmc.nl> to ensure

correct sid type returned for builtin sids.
Jeremy.

diff --git a/source/nsswitch/winbindd_passdb.c b/source/nsswitch/winbindd_passdb.c
index 12f5e0bae2e8aca1b62617e954abad9c12dfd3d2..3adb81caa354eaffc63ec5d455e91b3e705d5482 100644 (file)
--- a/source/nsswitch/winbindd_passdb.c
+++ b/source/nsswitch/winbindd_passdb.c
@@ -240,7 +240,11 @@ static NTSTATUS name_to_sid(struct winbindd_domain *domain,
        if (!pdb_find_alias(name, sid))
                return NT_STATUS_NONE_MAPPED;
 
-       *type = SID_NAME_ALIAS;
+       if (sid_check_is_in_builtin(sid))
+               *type = SID_NAME_WKN_GRP;
+       else
+               *type = SID_NAME_ALIAS;
+
        return NT_STATUS_OK;
 }
 
@@ -263,7 +267,10 @@ static NTSTATUS sid_to_name(struct winbindd_domain *domain,
 
        *domain_name = talloc_strdup(mem_ctx, domain->name);
        *name = talloc_strdup(mem_ctx, info.acct_name);
-       *type = SID_NAME_ALIAS;
+       if (sid_check_is_in_builtin(sid))
+               *type = SID_NAME_WKN_GRP;
+       else
+               *type = SID_NAME_ALIAS;
 
        return NT_STATUS_OK;
 }