Wrap the unix token info in a unix_user_token in auth_serversupplied_info

[kai/samba.git] / source3 / smbd / password.c

diff --git a/source3/smbd/password.c b/source3/smbd/password.c
index 673a1a01c13156749f8d2bb17f41466054581a2f..1d3514429f33d5c74d3aae06dc12b93b5c841b97 100644 (file)
--- a/source3/smbd/password.c
+++ b/source3/smbd/password.c
@@ -127,7 +127,7 @@ void invalidate_vuid(uint16 vuid)
 
        /* clear the vuid from the 'cache' on each connection, and
           from the vuid 'owner' of connections */
-       conn_clear_vuid_cache(vuid);
+       conn_clear_vuid_caches(vuid);
 
        TALLOC_FREE(vuser);
        num_validated_vuids--;
@@ -271,8 +271,8 @@ int register_existing_vuid(uint16 vuid,
                vuser->server_info, tmp);
 
        DEBUG(10,("register_existing_vuid: (%u,%u) %s %s %s guest=%d\n",
-                 (unsigned int)vuser->server_info->uid,
-                 (unsigned int)vuser->server_info->gid,
+                 (unsigned int)vuser->server_info->utok.uid,
+                 (unsigned int)vuser->server_info->utok.gid,
                  vuser->server_info->unix_name,
                  vuser->server_info->sanitized_username,
                  pdb_get_domain(vuser->server_info->sam_account),
@@ -289,7 +289,7 @@ int register_existing_vuid(uint16 vuid,
        }
 
        DEBUG(3,("register_existing_vuid: UNIX uid %d is UNIX user %s, "
-               "and will be vuid %u\n", (int)vuser->server_info->uid,
+               "and will be vuid %u\n", (int)vuser->server_info->utok.uid,
                 vuser->server_info->unix_name, vuser->vuid));
 
        next_vuid++;