From 9392b13dff69effb0f76fff4074d20e06f249feb Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 29 Sep 2020 13:58:22 -0700 Subject: [PATCH] s3: smbd: Remove the wrapper srvstr_get_path_req_wcard(). Rename srvstr_get_path_req_wcard() -> srvstr_get_path_req() as it no longer gets ward status. Signed-off-by: Jeremy Allison Reviewed-by: Ralph Boehme --- source3/smbd/reply.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index a6a54827ad6..04a80745489 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -357,10 +357,11 @@ size_t srvstr_get_path_posix(TALLOC_CTX *ctx, } -static size_t srvstr_get_path_req_wcard(TALLOC_CTX *mem_ctx, struct smb_request *req, +size_t srvstr_get_path_req(TALLOC_CTX *mem_ctx, struct smb_request *req, char **pp_dest, const char *src, int flags, - NTSTATUS *err, bool *contains_wcard) + NTSTATUS *err) { + bool ignore; ssize_t bufrem = smbreq_bufrem(req, src); if (bufrem < 0) { @@ -378,7 +379,7 @@ static size_t srvstr_get_path_req_wcard(TALLOC_CTX *mem_ctx, struct smb_request flags, true, err, - contains_wcard); + &ignore); } else { return srvstr_get_path_wcard_internal(mem_ctx, (const char *)req->inbuf, @@ -389,19 +390,10 @@ static size_t srvstr_get_path_req_wcard(TALLOC_CTX *mem_ctx, struct smb_request flags, false, err, - contains_wcard); + &ignore); } } -size_t srvstr_get_path_req(TALLOC_CTX *mem_ctx, struct smb_request *req, - char **pp_dest, const char *src, int flags, - NTSTATUS *err) -{ - bool ignore; - return srvstr_get_path_req_wcard(mem_ctx, req, pp_dest, src, - flags, err, &ignore); -} - /** * pull a string from the smb_buf part of a packet. In this case the * string can either be null terminated or it can be terminated by the