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: In unix_convert(), remove all references to state->name_has_wildcard.

Browse Source 
It is never set.

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 12:55:41 -08:00 committed by Ralph Boehme
parent 1d52a4a467
commit b21ba035bf
1 changed files with 2 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
source3/smbd/filename.c
View File

@ -1163,7 +1163,7 @@ NTSTATUS unix_convert(TALLOC_CTX *mem_ctx,
DBG_DEBUG("Begin: name [%s] dirpath [%s] name [%s]\n",
state->smb_fname->base_name, state->dirpath, state->name);
if (!state->name_has_wildcard) {
{
int parent_stat_errno = 0;
/*
@ -1280,27 +1280,6 @@ NTSTATUS unix_convert(TALLOC_CTX *mem_ctx,
goto done;
}
}
} else {
/*
* We have a wildcard in the pathname.
*
* Optimization for common case where the wildcard
* is in the last component and the client already
* sent the correct case.
* NOTE : check_parent_exists() doesn't preserve errno.
*/
int saved_errno = errno;
status = check_parent_exists(state->mem_ctx,
state->conn,
state->posix_pathnames,
state->smb_fname,
&state->dirpath,
&state->name,
NULL);
errno = saved_errno;
if (!NT_STATUS_IS_OK(status)) {
goto fail;
}
}
/*
@ -1346,7 +1325,7 @@ NTSTATUS unix_convert(TALLOC_CTX *mem_ctx,
* components as this can change the size.
*/
if(!state->component_was_mangled && !state->name_has_wildcard) {
if(!state->component_was_mangled) {
stat_cache_add(state->orig_path,
state->smb_fname->base_name,
state->smb_fname->twrp,