sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-25 23:21:54 +03:00
Code

s3: smbd: Remove the wrapper srvstr_get_path_req_wcard().

Browse Source 
Rename srvstr_get_path_req_wcard() -> srvstr_get_path_req()
as it no longer gets ward status.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
This commit is contained in:
Jeremy Allison 2020-09-29 13:58:22 -07:00 committed by Ralph Boehme
parent 26e8bd7e1e
commit 9392b13dff
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source3/smbd/reply.c
View File

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