From: Jeremy Allison Date: Mon, 24 May 2021 23:36:43 +0000 (-0700) Subject: s3: smbd: In mkdir_internal(), use the passed in 'smb_fname_atname' instead of a... X-Git-Tag: tevent-0.11.0~608 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8d4a73db8be6a7da930207893a7433d1fbcf8cf5;p=thirdparty%2Fsamba.git s3: smbd: In mkdir_internal(), use the passed in 'smb_fname_atname' instead of a local 'base_name' variable. atname is a better name, as base_name refers to the name without streams and this is nothing to do with streams. Signed-off-by: Jeremy Allison Reviewed-by: Ralph Boehme --- diff --git a/source3/smbd/open.c b/source3/smbd/open.c index a50f99e6630..6b03eec53c6 100644 --- a/source3/smbd/open.c +++ b/source3/smbd/open.c @@ -4401,7 +4401,7 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn, static NTSTATUS mkdir_internal(connection_struct *conn, struct smb_filename *parent_dir_fname_in, /* parent. */ - struct smb_filename *smb_fname_atname_in, /* atname relative to parent. */ + struct smb_filename *smb_fname_atname, /* atname relative to parent. */ struct smb_filename *smb_dname, /* full pathname from root of share. */ uint32_t file_attributes, struct files_struct *fsp) @@ -4410,7 +4410,6 @@ static NTSTATUS mkdir_internal(connection_struct *conn, loadparm_s3_global_substitution(); mode_t mode; struct smb_filename *parent_dir_fname = parent_dir_fname_in; - struct smb_filename *base_name = smb_fname_atname_in; NTSTATUS status; bool posix_open = false; bool need_re_stat = false; @@ -4453,7 +4452,7 @@ static NTSTATUS mkdir_internal(connection_struct *conn, ret = SMB_VFS_MKDIRAT(conn, parent_dir_fname->fsp, - base_name, + smb_fname_atname, mode); if (ret != 0) { return map_nt_error_from_unix(errno);