sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

s3: smbd: Remove unused 'bool *ppath_contains_wcard' parameter from parse_dfs_path().

Browse Source 
check_path_syntax_wcard() is now unused.

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 17:14:22 -07:00 committed by Ralph Boehme
parent 25ef25528e
commit f9321ed7dd
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
source3/smbd/msdfs.c
View File

@ -58,8 +58,7 @@ static NTSTATUS parse_dfs_path(connection_struct *conn,
const char *pathname, const char *pathname,
bool allow_wcards, bool allow_wcards,
bool allow_broken_path, bool allow_broken_path,
struct dfs_path *pdp, /* MUST BE TALLOCED */ struct dfs_path *pdp) /* MUST BE TALLOCED */
bool *ppath_contains_wcard)
{ {
const struct loadparm_substitution *lp_sub = const struct loadparm_substitution *lp_sub =
loadparm_s3_global_substitution(); loadparm_s3_global_substitution();
@ -208,8 +207,6 @@ static NTSTATUS parse_dfs_path(connection_struct *conn,
local_path: local_path:
*ppath_contains_wcard = False;
pdp->reqpath = p; pdp->reqpath = p;
/* Rest is reqpath. */ /* Rest is reqpath. */
@ -829,15 +826,13 @@ NTSTATUS dfs_redirect(TALLOC_CTX *ctx,
NTSTATUS status; NTSTATUS status;
bool search_wcard_flag = (ucf_flags & UCF_ALWAYS_ALLOW_WCARD_LCOMP); bool search_wcard_flag = (ucf_flags & UCF_ALWAYS_ALLOW_WCARD_LCOMP);
struct dfs_path *pdp = talloc(ctx, struct dfs_path); struct dfs_path *pdp = talloc(ctx, struct dfs_path);
bool ignore = false;
if (!pdp) { if (!pdp) {
return NT_STATUS_NO_MEMORY; return NT_STATUS_NO_MEMORY;
} }
status = parse_dfs_path(conn, path_in, search_wcard_flag, status = parse_dfs_path(conn, path_in, search_wcard_flag,
allow_broken_path, pdp, allow_broken_path, pdp);
&ignore);
if (!NT_STATUS_IS_OK(status)) { if (!NT_STATUS_IS_OK(status)) {
TALLOC_FREE(pdp); TALLOC_FREE(pdp);
return status; return status;
@ -976,7 +971,6 @@ NTSTATUS get_referred_path(TALLOC_CTX *ctx,
struct connection_struct *conn = NULL; struct connection_struct *conn = NULL;
int snum; int snum;
NTSTATUS status = NT_STATUS_NOT_FOUND; NTSTATUS status = NT_STATUS_NOT_FOUND;
bool dummy;
struct dfs_path *pdp = talloc_zero(frame, struct dfs_path); struct dfs_path *pdp = talloc_zero(frame, struct dfs_path);
if (!pdp) { if (!pdp) {
@ -986,8 +980,7 @@ NTSTATUS get_referred_path(TALLOC_CTX *ctx,
*self_referralp = False; *self_referralp = False;
status = parse_dfs_path(NULL, dfs_path, False, allow_broken_path, status = parse_dfs_path(NULL, dfs_path, False, allow_broken_path, pdp);
pdp, &dummy);
if (!NT_STATUS_IS_OK(status)) { if (!NT_STATUS_IS_OK(status)) {
TALLOC_FREE(frame); TALLOC_FREE(frame);
return status; return status;
@ -1229,15 +1222,13 @@ bool create_junction(TALLOC_CTX *ctx,
const struct loadparm_substitution *lp_sub = const struct loadparm_substitution *lp_sub =
loadparm_s3_global_substitution(); loadparm_s3_global_substitution();
int snum; int snum;
bool dummy;
struct dfs_path *pdp = talloc(ctx,struct dfs_path); struct dfs_path *pdp = talloc(ctx,struct dfs_path);
NTSTATUS status; NTSTATUS status;
if (!pdp) { if (!pdp) {
return False; return False;
} }
status = parse_dfs_path(NULL, dfs_path, False, allow_broken_path, status = parse_dfs_path(NULL, dfs_path, False, allow_broken_path, pdp);
pdp, &dummy);
if (!NT_STATUS_IS_OK(status)) { if (!NT_STATUS_IS_OK(status)) {
return False; return False;
} }