From b619e2042a436e40ee445db102701c9dc9515492 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 12 Mar 2020 10:15:10 -0700 Subject: s3: smbd: In reply_ulogoffX(), replace req -> smb1req. Minimises the diff in later commits. BUG: https://bugzilla.samba.org/show_bug.cgi?id=14301 Signed-off-by: Jeremy Allison Reviewed-by: Ralph Boehme (cherry picked from commit 5c073aa01b304f54a0039d9cd9dc74123191eb4b) --- source3/smbd/reply.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index f2b94bd1c40..f76e9ee0bc8 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -2612,7 +2612,7 @@ void reply_open_and_X(struct smb_request *req) Reply to a SMBulogoffX. ****************************************************************************/ -void reply_ulogoffX(struct smb_request *req) +void reply_ulogoffX(struct smb_request *smb1req) { struct timeval now = timeval_current(); struct smbXsrv_session *session = NULL; @@ -2620,16 +2620,16 @@ void reply_ulogoffX(struct smb_request *req) START_PROFILE(SMBulogoffX); - status = smb1srv_session_lookup(req->xconn, - req->vuid, + status = smb1srv_session_lookup(smb1req->xconn, + smb1req->vuid, timeval_to_nttime(&now), &session); if (!NT_STATUS_IS_OK(status)) { DEBUG(3,("ulogoff, vuser id %llu does not map to user.\n", - (unsigned long long)req->vuid)); + (unsigned long long)smb1req->vuid)); - req->vuid = UID_FIELD_INVALID; - reply_force_doserror(req, ERRSRV, ERRbaduid); + smb1req->vuid = UID_FIELD_INVALID; + reply_force_doserror(smb1req, ERRSRV, ERRbaduid); END_PROFILE(SMBulogoffX); return; } @@ -2653,15 +2653,15 @@ void reply_ulogoffX(struct smb_request *req) TALLOC_FREE(session); - reply_outbuf(req, 2, 0); - SSVAL(req->outbuf, smb_vwv0, 0xff); /* andx chain ends */ - SSVAL(req->outbuf, smb_vwv1, 0); /* no andx offset */ + reply_outbuf(smb1req, 2, 0); + SSVAL(smb1req->outbuf, smb_vwv0, 0xff); /* andx chain ends */ + SSVAL(smb1req->outbuf, smb_vwv1, 0); /* no andx offset */ DEBUG(3, ("ulogoffX vuid=%llu\n", - (unsigned long long)req->vuid)); + (unsigned long long)smb1req->vuid)); END_PROFILE(SMBulogoffX); - req->vuid = UID_FIELD_INVALID; + smb1req->vuid = UID_FIELD_INVALID; } #if 0 -- cgit v1.2.1