sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-24 10:50:22 +03:00
Code

s3: smbd: Inside 'struct uc_state', remove allow_wcard_last_component.

Browse Source 
This is never allowed.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
This commit is contained in:
Jeremy Allison 2021-12-03 11:33:42 -08:00 committed by Ralph Boehme
parent da1417fb37
commit e1cc3e3a67
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source3/smbd/filename.c
View File

@ -538,7 +538,6 @@ struct uc_state {
bool component_was_mangled;
bool name_has_wildcard;
bool posix_pathnames;
bool allow_wcard_last_component;
bool done;
bool case_sensitive;
bool case_preserve;
@ -896,7 +895,7 @@ static NTSTATUS unix_convert_step(struct uc_state *state)
return NT_STATUS_OBJECT_NAME_INVALID;
}
return determine_path_error(state->end+1,
state->allow_wcard_last_component,
false,
state->posix_pathnames);
}
@ -988,7 +987,6 @@ NTSTATUS unix_convert(TALLOC_CTX *mem_ctx,
.orig_path = orig_path,
.ucf_flags = ucf_flags,
.posix_pathnames = (ucf_flags & UCF_POSIX_PATHNAMES),
.allow_wcard_last_component = (ucf_flags & UCF_ALWAYS_ALLOW_WCARD_LCOMP),
.case_sensitive = conn->case_sensitive,
.case_preserve = conn->case_preserve,
.short_case_preserve = conn->short_case_preserve,
@ -1074,7 +1072,7 @@ NTSTATUS unix_convert(TALLOC_CTX *mem_ctx,
status = NT_STATUS_OBJECT_NAME_INVALID;
} else {
status =determine_path_error(&state->orig_path[2],
state->allow_wcard_last_component,
false,
state->posix_pathnames);
}
goto err;
@ -1201,7 +1199,7 @@ NTSTATUS unix_convert(TALLOC_CTX *mem_ctx,
if (!state->posix_pathnames) {
/* POSIX pathnames have no wildcards. */
state->name_has_wildcard = ms_has_wild(state->smb_fname->base_name);
if (state->name_has_wildcard && !state->allow_wcard_last_component) {
if (state->name_has_wildcard) {
/* Wildcard not valid anywhere. */
status = NT_STATUS_OBJECT_NAME_INVALID;
goto fail;