s3: smbd: In reply_ulogoffX(), replace req -> smb1req.
authorJeremy Allison <jra@samba.org>
Thu, 12 Mar 2020 17:15:10 +0000 (10:15 -0700)
committerJeremy Allison <jra@samba.org>
Wed, 18 Mar 2020 18:03:29 +0000 (18:03 +0000)
Minimises the diff in later commits.

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

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
source3/smbd/reply.c

index 6cb5a3c7360ee653fc8150e0d41239d81fcdffcf..09e068abf299e363964b788b78d2c48114a69069 100644 (file)
@@ -2613,7 +2613,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;
@@ -2621,16 +2621,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;
        }
@@ -2654,15 +2654,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