From: Ralph Boehme <slow@samba.org>
Date: Sun, 29 Dec 2019 13:33:00 +0000 (+0100)
Subject: smbd: remove vuid from struct user_struct
X-Git-Tag: ldb-2.1.0~43
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=61fa0f99768bf3519cafd2c49d0b774bc4c22841;p=thirdparty%2Fsamba.git

smbd: remove vuid from struct user_struct

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>
---

diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h
index 174e9b2d885..16d1de4c49f 100644
--- a/source3/smbd/globals.h
+++ b/source3/smbd/globals.h
@@ -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;
 
diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c
index 5826383d5d4..94d1ac1e047 100644
--- a/source3/smbd/sesssetup.c
+++ b/source3/smbd/sesssetup.c
@@ -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++;
 
diff --git a/source3/smbd/smb2_sesssetup.c b/source3/smbd/smb2_sesssetup.c
index 11c0e3e8d4f..e7e9df031f6 100644
--- a/source3/smbd/smb2_sesssetup.c
+++ b/source3/smbd/smb2_sesssetup.c
@@ -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);