sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-12 09:18:10 +03:00
Code

s3: smbd: Move lp_posix_pathnames() out of srvstr_get_path_wcard_internal().

Browse Source 
Pass as parameter. Part of moving this switch out to the external request
parsing code.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Volker Lendecke <Volker.Lendecke@SerNet.DE>
This commit is contained in:
Jeremy Allison 2015-12-22 12:52:58 -08:00
parent f33224dbcf
commit 4a6d7e1e15
1 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
source3/smbd/reply.c
View File

@ -253,15 +253,17 @@ NTSTATUS check_path_syntax_posix(char *path)
/****************************************************************************
Pull a string and check the path allowing a wilcard - provide for error return.
Passes in posix flag.
****************************************************************************/
size_t srvstr_get_path_wcard(TALLOC_CTX *ctx,
static size_t srvstr_get_path_wcard_internal(TALLOC_CTX *ctx,
const char *base_ptr,
uint16_t smb_flags2,
char **pp_dest,
const char *src,
size_t src_len,
int flags,
bool posix_pathnames,
NTSTATUS *err,
bool *contains_wcard)
{
@ -288,7 +290,7 @@ size_t srvstr_get_path_wcard(TALLOC_CTX *ctx,
return ret;
}
if (lp_posix_pathnames()) {
if (posix_pathnames) {
*err = check_path_syntax_posix(*pp_dest);
} else {
*err = check_path_syntax_wcard(*pp_dest, contains_wcard);
@ -297,6 +299,32 @@ size_t srvstr_get_path_wcard(TALLOC_CTX *ctx,
return ret;
}
/****************************************************************************
Pull a string and check the path allowing a wilcard - provide for error return.
****************************************************************************/
size_t srvstr_get_path_wcard(TALLOC_CTX *ctx,
const char *base_ptr,
uint16_t smb_flags2,
char **pp_dest,
const char *src,
size_t src_len,
int flags,
NTSTATUS *err,
bool *contains_wcard)
{
return srvstr_get_path_wcard_internal(ctx,
base_ptr,
smb_flags2,
pp_dest,
src,
src_len,
flags,
lp_posix_pathnames(),
err,
contains_wcard);
}
/****************************************************************************
Pull a string and check the path - provide for error return.
****************************************************************************/