server: Fix assignment of primary_group in token_duplicate.

Signed-off-by: Sebastian Lackner <sebastian@fds-team.de> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

server: Fix assignment of primary_group in token_duplicate.
25b0a498 · Sebastian Lackner · Alexandre Julliard · fe2f86e9 · 25b0a498
Commit 25b0a498 authored Dec 21, 2015 by Sebastian Lackner Committed by Alexandre Julliard Dec 21, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

token.c server/token.c +3 -1

No files found.
--- a/server/token.c
+++ b/server/token.c
@@ -559,6 +559,7 @@ struct token *token_duplicate( struct token *src_token, unsigned primary,
    if (!token) return token;

    /* copy groups */
+    token->primary_group = NULL;
    LIST_FOR_EACH_ENTRY( group, &src_token->groups, struct group, entry )
    {
        size_t size = FIELD_OFFSET( struct group, sid.SubAuthority[group->sid.SubAuthorityCount] );
@@ -570,8 +571,9 @@ struct token *token_duplicate( struct token *src_token, unsigned primary,
        }
        memcpy( newgroup, group, size );
        list_add_tail( &token->groups, &newgroup->entry );
+        if (src_token->primary_group == &group->sid)
+            token->primary_group = &newgroup->sid;
    }
-    token->primary_group = src_token->primary_group;
    assert( token->primary_group );

    /* copy privileges */