From: Ralph Boehme <slow@samba.org>
Date: Mon, 25 Nov 2019 09:17:38 +0000 (+0100)
Subject: s3: remove unused session_keystr from struct user_struct
X-Git-Tag: ldb-2.1.0~154
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=670205acab186448e175433225bfebacf3500900;p=thirdparty%2Fsamba.git

s3: remove unused session_keystr from struct user_struct

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

Autobuild-User(master): Ralph Böhme <slow@samba.org>
Autobuild-Date(master): Fri Dec 20 13:06:20 UTC 2019 on sn-devel-184
---

diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h
index e6641837668..ee4116c76ba 100644
--- a/source3/smbd/globals.h
+++ b/source3/smbd/globals.h
@@ -838,8 +838,6 @@ struct user_struct {
 	struct user_struct *next, *prev;
 	uint64_t vuid; /* Tag for this entry. */
 
-	char *session_keystr; /* used by utmp and pam session code.
-				 TDB key string */
 	int homes_snum;
 
 	struct auth_session_info *session_info;
diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c
index 390933cd6cd..49576f705da 100644
--- a/source3/smbd/sesssetup.c
+++ b/source3/smbd/sesssetup.c
@@ -312,7 +312,6 @@ static void reply_sesssetup_and_X_spnego(struct smb_request *req)
 		session->compat->session = session;
 		session->compat->homes_snum = -1;
 		session->compat->session_info = session_info;
-		session->compat->session_keystr = NULL;
 		session->compat->vuid = session->global->session_wire_id;
 		DLIST_ADD(sconn->users, session->compat);
 		sconn->num_users++;
@@ -1074,7 +1073,6 @@ void reply_sesssetup_and_X(struct smb_request *req)
 	session->compat->session = session;
 	session->compat->homes_snum = -1;
 	session->compat->session_info = session_info;
-	session->compat->session_keystr = NULL;
 	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 82ac1182ecc..dad9be78574 100644
--- a/source3/smbd/smb2_sesssetup.c
+++ b/source3/smbd/smb2_sesssetup.c
@@ -532,7 +532,6 @@ static NTSTATUS smbd_smb2_auth_generic_return(struct smbXsrv_session *session,
 	session->compat->session = session;
 	session->compat->homes_snum = -1;
 	session->compat->session_info = session_info;
-	session->compat->session_keystr = NULL;
 	session->compat->vuid = session->global->session_wire_id;
 	DLIST_ADD(smb2req->sconn->users, session->compat);
 	smb2req->sconn->num_users++;