From: Stefan Metzmacher <metze@samba.org>
Date: Wed, 8 Jul 2020 11:59:26 +0000 (+0200)
Subject: s3:smbd: setup client->global->client_guid even without multichannel support
X-Git-Tag: samba-4.13.0rc1~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c66110cf33758ee0da035a05585195621b60a393;p=thirdparty%2Fsamba.git

s3:smbd: setup client->global->client_guid even without multichannel support

It's too confusing if client->global->client_guid and
client->connections->smb2.client.guid don't have the same value.

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

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Günther Deschner <gd@samba.org>
---

diff --git a/source3/smbd/smb2_negprot.c b/source3/smbd/smb2_negprot.c
index 2c1d4185b28..4071f42b5e0 100644
--- a/source3/smbd/smb2_negprot.c
+++ b/source3/smbd/smb2_negprot.c
@@ -657,7 +657,13 @@ NTSTATUS smbd_smb2_request_process_negprot(struct smbd_smb2_request *req)
 		/*
 		 * Only deal with the client guid database
 		 * if multi-channel is enabled.
+		 *
+		 * But we still need to setup
+		 * xconn->client->global->client_guid to
+		 * the correct value.
 		 */
+		xconn->client->global->client_guid =
+			xconn->smb2.client.guid;
 		return smbd_smb2_request_done(req, outbody, &outdyn);
 	}