server: Extend get_token_user server call to also retrieve SIDs for the token's owner or primary group.
diff --git a/server/trace.c b/server/trace.c
index a529e5b..a4b1faa 100644
--- a/server/trace.c
+++ b/server/trace.c
@@ -3426,15 +3426,16 @@
     dump_varargs_LUID_AND_ATTRIBUTES( ", privileges=", cur_size );
 }
 
-static void dump_get_token_user_request( const struct get_token_user_request *req )
+static void dump_get_token_sid_request( const struct get_token_sid_request *req )
 {
     fprintf( stderr, " handle=%04x", req->handle );
+    fprintf( stderr, ", which_sid=%08x", req->which_sid );
 }
 
-static void dump_get_token_user_reply( const struct get_token_user_reply *req )
+static void dump_get_token_sid_reply( const struct get_token_sid_reply *req )
 {
-    fprintf( stderr, " user_len=%u", req->user_len );
-    dump_varargs_SID( ", user=", cur_size );
+    fprintf( stderr, " sid_len=%u", req->sid_len );
+    dump_varargs_SID( ", sid=", cur_size );
 }
 
 static void dump_get_token_groups_request( const struct get_token_groups_request *req )
@@ -4012,7 +4013,7 @@
     (dump_func)dump_check_token_privileges_request,
     (dump_func)dump_duplicate_token_request,
     (dump_func)dump_access_check_request,
-    (dump_func)dump_get_token_user_request,
+    (dump_func)dump_get_token_sid_request,
     (dump_func)dump_get_token_groups_request,
     (dump_func)dump_get_token_default_dacl_request,
     (dump_func)dump_set_token_default_dacl_request,
@@ -4256,7 +4257,7 @@
     (dump_func)dump_check_token_privileges_reply,
     (dump_func)dump_duplicate_token_reply,
     (dump_func)dump_access_check_reply,
-    (dump_func)dump_get_token_user_reply,
+    (dump_func)dump_get_token_sid_reply,
     (dump_func)dump_get_token_groups_reply,
     (dump_func)dump_get_token_default_dacl_reply,
     NULL,
@@ -4500,7 +4501,7 @@
     "check_token_privileges",
     "duplicate_token",
     "access_check",
-    "get_token_user",
+    "get_token_sid",
     "get_token_groups",
     "get_token_default_dacl",
     "set_token_default_dacl",