]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
s3: smbd: In reply_tdis(), replace req -> smb1req.
authorJeremy Allison <jra@samba.org>
Thu, 12 Mar 2020 16:55:30 +0000 (09:55 -0700)
committerJeremy Allison <jra@samba.org>
Wed, 18 Mar 2020 18:03:29 +0000 (18:03 +0000)
Minimises the diff in the next commit.

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 d216ffd8fbf38c0e0f00dcd347774371aaa96dca..8aac268010a86e0e06733d808eaf7abf8a21a76c 100644 (file)
@@ -6039,28 +6039,28 @@ void reply_unlock(struct smb_request *req)
  conn POINTER CAN BE NULL HERE !
 ****************************************************************************/
 
-void reply_tdis(struct smb_request *req)
+void reply_tdis(struct smb_request *smb1req)
 {
        NTSTATUS status;
-       connection_struct *conn = req->conn;
+       connection_struct *conn = smb1req->conn;
        struct smbXsrv_tcon *tcon;
 
        START_PROFILE(SMBtdis);
 
        if (!conn) {
                DEBUG(4,("Invalid connection in tdis\n"));
-               reply_force_doserror(req, ERRSRV, ERRinvnid);
+               reply_force_doserror(smb1req, ERRSRV, ERRinvnid);
                END_PROFILE(SMBtdis);
                return;
        }
 
        tcon = conn->tcon;
-       req->conn = NULL;
+       smb1req->conn = NULL;
 
        /*
         * TODO: cancel all outstanding requests on the tcon
         */
-       status = smbXsrv_tcon_disconnect(tcon, req->vuid);
+       status = smbXsrv_tcon_disconnect(tcon, smb1req->vuid);
        if (!NT_STATUS_IS_OK(status)) {
                DEBUG(0, ("reply_tdis: "
                          "smbXsrv_tcon_disconnect() failed: %s\n",
@@ -6076,7 +6076,7 @@ void reply_tdis(struct smb_request *req)
 
        TALLOC_FREE(tcon);
 
-       reply_outbuf(req, 0, 0);
+       reply_outbuf(smb1req, 0, 0);
        END_PROFILE(SMBtdis);
        return;
 }