From: Jeremy Allison <jra@samba.org>
Date: Tue, 29 Sep 2020 20:26:02 +0000 (-0700)
Subject: s3: smbd: SMB1 reply_copy(). Use srvstr_get_path_req() not srvstr_get_path_req_wcard()
X-Git-Tag: talloc-2.3.2~396
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=08d029c2902dd70fe64e08e6fb212ae7cbb0882c;p=thirdparty%2Fsamba.git

s3: smbd: SMB1 reply_copy(). Use srvstr_get_path_req() not srvstr_get_path_req_wcard()

Now we check the wildcard status elsewhere. Don't pass to filename_convert() either.

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 e8a1717360a..9f8ca773548 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -8725,14 +8725,14 @@ void reply_copy(struct smb_request *req)
 	flags = SVAL(req->vwv+2, 0);
 
 	p = (const char *)req->buf;
-	p += srvstr_get_path_req_wcard(ctx, req, &fname_src, p, STR_TERMINATE,
-				       &status, &source_has_wild);
+	p += srvstr_get_path_req(ctx, req, &fname_src, p, STR_TERMINATE,
+				       &status);
 	if (!NT_STATUS_IS_OK(status)) {
 		reply_nterror(req, status);
 		goto out;
 	}
-	p += srvstr_get_path_req_wcard(ctx, req, &fname_dst, p, STR_TERMINATE,
-				       &status, &dest_has_wild);
+	p += srvstr_get_path_req(ctx, req, &fname_dst, p, STR_TERMINATE,
+				       &status);
 	if (!NT_STATUS_IS_OK(status)) {
 		reply_nterror(req, status);
 		goto out;
@@ -8751,7 +8751,7 @@ void reply_copy(struct smb_request *req)
 				  fname_src,
 				  ucf_flags_src,
 				  0,
-				  &source_has_wild,
+				  NULL,
 				  &smb_fname_src);
 	if (!NT_STATUS_IS_OK(status)) {
 		if (NT_STATUS_EQUAL(status,NT_STATUS_PATH_NOT_COVERED)) {
@@ -8767,7 +8767,7 @@ void reply_copy(struct smb_request *req)
 				  fname_dst,
 				  ucf_flags_dst,
 				  0,
-				  &dest_has_wild,
+				  NULL,
 				  &smb_fname_dst);
 	if (!NT_STATUS_IS_OK(status)) {
 		if (NT_STATUS_EQUAL(status,NT_STATUS_PATH_NOT_COVERED)) {