From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 28 Jul 2020 10:11:38 +0000 (+0200)
Subject: smbd: let smbd_request_guid() use smb1req->xconn->channel_id
X-Git-Tag: tevent-0.11.0~1677
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=18818dba00db4d9cfccf58f86ef0764145a654da;p=thirdparty%2Fsamba.git

smbd: let smbd_request_guid() use smb1req->xconn->channel_id

The unique identifier of a channel/connection is the channel_id,
the pointer of 'xconn' can be reused.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14534

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
---

diff --git a/source3/smbd/globals.c b/source3/smbd/globals.c
index c0fafecd2eb..4d4553649c0 100644
--- a/source3/smbd/globals.c
+++ b/source3/smbd/globals.c
@@ -120,7 +120,7 @@ struct GUID smbd_request_guid(struct smb_request *smb1req, uint16_t idx)
 		v.time_mid = (uint16_t)(uintptr_t)smb1req->vwv;
 	}
 
-	SBVAL((uint8_t *)&v, 8, (uintptr_t)smb1req->xconn);
+	SBVAL((uint8_t *)&v, 8, smb1req->xconn->channel_id);
 
 	return v;
 }