From: Jeremy Allison <jra@samba.org>
Date: Tue, 29 Sep 2020 20:09:52 +0000 (-0700)
Subject: s3: smbd: SMB1 reply_mv() no longer needs the XX_has_wcard variables.
X-Git-Tag: talloc-2.3.2~398
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=079aec9d09ee0be72a635ce17aa97686239df4f4;p=thirdparty%2Fsamba.git

s3: smbd: SMB1 reply_mv() no longer needs the XX_has_wcard variables.

Use srvstr_get_path_req() not srvstr_get_path_req_wcard().

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 6dc00c750ef..66552164533 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -8362,8 +8362,6 @@ void reply_mv(struct smb_request *req)
 	const char *p;
 	uint32_t attrs;
 	NTSTATUS status;
-	bool src_has_wcard = False;
-	bool dest_has_wcard = False;
 	TALLOC_CTX *ctx = talloc_tos();
 	struct smb_filename *smb_fname_src = NULL;
 	struct smb_filename *smb_fname_dst = NULL;
@@ -8388,15 +8386,15 @@ void reply_mv(struct smb_request *req)
 	attrs = SVAL(req->vwv+0, 0);
 
 	p = (const char *)req->buf + 1;
-	p += srvstr_get_path_req_wcard(ctx, req, &name, p, STR_TERMINATE,
-				       &status, &src_has_wcard);
+	p += srvstr_get_path_req(ctx, req, &name, p, STR_TERMINATE,
+				       &status);
 	if (!NT_STATUS_IS_OK(status)) {
 		reply_nterror(req, status);
 		goto out;
 	}
 	p++;
-	p += srvstr_get_path_req_wcard(ctx, req, &newname, p, STR_TERMINATE,
-				       &status, &dest_has_wcard);
+	p += srvstr_get_path_req(ctx, req, &newname, p, STR_TERMINATE,
+				       &status);
 	if (!NT_STATUS_IS_OK(status)) {
 		reply_nterror(req, status);
 		goto out;
@@ -8419,7 +8417,7 @@ void reply_mv(struct smb_request *req)
 				  name,
 				  src_ucf_flags,
 				  0,
-				  &src_has_wcard,
+				  NULL,
 				  &smb_fname_src);
 
 	if (!NT_STATUS_IS_OK(status)) {
@@ -8437,7 +8435,7 @@ void reply_mv(struct smb_request *req)
 				  newname,
 				  dst_ucf_flags,
 				  0,
-				  &dest_has_wcard,
+				  NULL,
 				  &smb_fname_dst);
 
 	if (!NT_STATUS_IS_OK(status)) {