smbd: remove vuid from struct user_struct
authorRalph Boehme <slow@samba.org>
Sun, 29 Dec 2019 13:33:00 +0000 (14:33 +0100)
committerJeremy Allison <jra@samba.org>
Mon, 13 Jan 2020 19:41:34 +0000 (19:41 +0000)
The previous commit removed all users of struct user_struct.vuid.

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
source3/smbd/globals.h
source3/smbd/sesssetup.c
source3/smbd/smb2_sesssetup.c

index 174e9b2d8853d63db5a53249e80d8bd791a64955..16d1de4c49f5bfd8fdf964e055e71e92edcdf549 100644 (file)
@@ -836,7 +836,6 @@ struct pending_auth_data;
 
 struct user_struct {
        struct user_struct *next, *prev;
-       uint64_t vuid; /* Tag for this entry. */
 
        struct auth_session_info *session_info;
 
index 5826383d5d4cd63a1967db750df71bb041357e21..94d1ac1e047cf4714fae2b48fc2eb82bda56d84b 100644 (file)
@@ -311,7 +311,6 @@ static void reply_sesssetup_and_X_spnego(struct smb_request *req)
                }
                session->compat->session = session;
                session->compat->session_info = session_info;
-               session->compat->vuid = session->global->session_wire_id;
                DLIST_ADD(sconn->users, session->compat);
                sconn->num_users++;
 
@@ -415,8 +414,6 @@ static void reply_sesssetup_and_X_spnego(struct smb_request *req)
 
                session->compat->session_info = session_info;
 
-               session->compat->vuid = session->global->session_wire_id;
-
                if (security_session_user_level(session_info, NULL) >= SECURITY_USER) {
                        session->homes_snum =
                                register_homes_share(session_info->unix_info->unix_name);
@@ -1071,7 +1068,6 @@ void reply_sesssetup_and_X(struct smb_request *req)
        }
        session->compat->session = session;
        session->compat->session_info = session_info;
-       session->compat->vuid = session->global->session_wire_id;
        DLIST_ADD(sconn->users, session->compat);
        sconn->num_users++;
 
index 11c0e3e8d4fd0780250438730916b1991b15c343..e7e9df031f6d25f415d5b7bc1949c5fe436b01dd 100644 (file)
@@ -531,7 +531,6 @@ static NTSTATUS smbd_smb2_auth_generic_return(struct smbXsrv_session *session,
        }
        session->compat->session = session;
        session->compat->session_info = session_info;
-       session->compat->vuid = session->global->session_wire_id;
        DLIST_ADD(smb2req->sconn->users, session->compat);
        smb2req->sconn->num_users++;
 
@@ -616,7 +615,6 @@ static NTSTATUS smbd_smb2_reauth_generic_return(struct smbXsrv_session *session,
        talloc_keep_secret(session_info->session_key.data);
 
        session->compat->session_info = session_info;
-       session->compat->vuid = session->global->session_wire_id;
 
        session->homes_snum =
                        register_homes_share(session_info->unix_info->unix_name);