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

smbd: pass struct smb_filename to get_real_filename()

Browse Source 
Prepares for passing struct smb_filename to SMB_VFS_GET_REAL_FILENAME().

This also makes it necessary to move the NULL or empty path checks to
unix_convert_step_stat().

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Ralph Boehme 2020-04-30 16:22:19 +02:00 committed by Jeremy Allison
parent 09b841aa1c
commit 82daff3efd
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
source3/smbd/filename.c
View File

@ -654,6 +654,8 @@ static NTSTATUS unix_convert_step_search_fail(struct uc_state *state)
static NTSTATUS unix_convert_step_stat(struct uc_state *state)
{
struct smb_filename dname;
char dot[2] = ".";
char *found_name = NULL;
int ret;
@ -752,8 +754,19 @@ static NTSTATUS unix_convert_step_stat(struct uc_state *state)
if (state->name_has_wildcard) {
return unix_convert_step_search_fail(state);
}
dname = (struct smb_filename) {
.base_name = state->dirpath,
.twrp = state->smb_fname->twrp,
};
/* handle null paths */
if ((dname.base_name == NULL) || (dname.base_name[0] == '\0')) {
dname.base_name = dot;
}
ret = get_real_filename(state->conn,
state->dirpath,
&dname,
state->name,
talloc_tos(),
&found_name);
@ -1653,7 +1666,7 @@ static int get_real_filename_full_scan(connection_struct *conn,
****************************************************************************/
int get_real_filename(connection_struct *conn,
const char *path,
struct smb_filename *path,
const char *name,
TALLOC_CTX *mem_ctx,
char **found_name)
@ -1661,16 +1674,11 @@ int get_real_filename(connection_struct *conn,
int ret;
bool mangled;
/* handle null paths */
if ((path == NULL) || (*path == 0)) {
path = ".";
}
mangled = mangle_is_mangled(name, conn->params);
if (mangled) {
return get_real_filename_full_scan(conn,
path,
path->base_name,
name,
mangled,
mem_ctx,
@ -1679,7 +1687,7 @@ int get_real_filename(connection_struct *conn,
/* Try the vfs first to take advantage of case-insensitive stat. */
ret = SMB_VFS_GET_REAL_FILENAME(conn,
path,
path->base_name,
name,
mem_ctx,
found_name);
@ -1694,7 +1702,7 @@ int get_real_filename(connection_struct *conn,
}
return get_real_filename_full_scan(conn,
path,
path->base_name,
name,
mangled,
mem_ctx,

2
source3/smbd/proto.h
View File

@ -368,7 +368,7 @@ NTSTATUS unix_convert(TALLOC_CTX *ctx,
NTSTATUS check_name(connection_struct *conn,
const struct smb_filename *smb_fname);
int get_real_filename(connection_struct *conn,
const char *path,
struct smb_filename *path,
const char *name,
TALLOC_CTX *mem_ctx,
char **found_name);