[PATCH] smbd: avoid use of smb2req->sconn in one place

Michael Adam obnox at samba.org
Wed Jan 13 01:16:35 UTC 2016


Just a tiny cleanup patch that percolates out
of the now revived multi-channel branch.

The goal is to avoid use of smb2req->sconn.

Review appreciated!

Thanks - Michael
-------------- next part --------------
From 27ca719e7478a2a0c57a5fa499aa8e5a535fb008 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Wed, 9 Sep 2015 15:08:56 +0200
Subject: [PATCH] s3:smbd_smb2_reauth_generic_return: make use of
 smb2req->xconn

More specifically move from smb2req->sconn to smb2req->xconn->client->sconn
to avouid using smb2req->sconn directly.

Signed-off-by: Michael Adam <obnox at samba.org>
---
 source3/smbd/smb2_sesssetup.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/source3/smbd/smb2_sesssetup.c b/source3/smbd/smb2_sesssetup.c
index 14249df..30e2d7f 100644
--- a/source3/smbd/smb2_sesssetup.c
+++ b/source3/smbd/smb2_sesssetup.c
@@ -493,6 +493,7 @@ static NTSTATUS smbd_smb2_reauth_generic_return(struct smbXsrv_session *session,
 	NTSTATUS status;
 	struct smbXsrv_session *x = session;
 	struct smbXsrv_session_auth0 *auth = *_auth;
+	struct smbXsrv_connection *xconn = smb2req->xconn;
 	size_t i;
 
 	*_auth = NULL;
@@ -540,7 +541,7 @@ static NTSTATUS smbd_smb2_reauth_generic_return(struct smbXsrv_session *session,
 		return NT_STATUS_LOGON_FAILURE;
 	}
 
-	conn_clear_vuid_caches(smb2req->sconn, session->compat->vuid);
+	conn_clear_vuid_caches(xconn->client->sconn, session->compat->vuid);
 
 	if (security_session_user_level(session_info, NULL) >= SECURITY_USER) {
 		smb2req->do_signing = true;
-- 
2.5.0

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20160113/83c30501/signature.sig>


More information about the samba-technical mailing list