]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
s3:smbd: setup client->global->client_guid even without multichannel support
authorStefan Metzmacher <metze@samba.org>
Wed, 8 Jul 2020 11:59:26 +0000 (13:59 +0200)
committerStefan Metzmacher <metze@samba.org>
Wed, 8 Jul 2020 15:54:40 +0000 (15:54 +0000)
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>
source3/smbd/smb2_negprot.c

index 2c1d4185b28e644218110008f0c0d06a6f54504e..4071f42b5e07c65c248d34c40b1498fdf3a7d0eb 100644 (file)
@@ -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);
        }