From: Jeremy Allison <jra@samba.org>
Date: Thu, 12 Mar 2020 16:55:30 +0000 (-0700)
Subject: s3: smbd: In reply_tdis(), replace req -> smb1req.
X-Git-Tag: ldb-2.2.0~1434
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ca4521f1dd97bc5a05e381c652b05ae1eb8bd29b;p=thirdparty%2Fsamba.git

s3: smbd: In reply_tdis(), replace req -> smb1req.

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>
---

diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index d216ffd8fbf..8aac268010a 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -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;
 }