]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
smbd: let smbd_request_guid() use smb1req->xconn->channel_id
authorStefan Metzmacher <metze@samba.org>
Tue, 28 Jul 2020 10:11:38 +0000 (12:11 +0200)
committerJeremy Allison <jra@samba.org>
Sat, 6 Mar 2021 02:20:05 +0000 (02:20 +0000)
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>
source3/smbd/globals.c

index c0fafecd2eb806a0ba45f2f16c0c7864f73607ba..4d4553649c0da1c575b6c8fb77c201356c531e02 100644 (file)
@@ -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;
 }