diff options
| -rw-r--r-- | source3/include/proto.h | 3 | ||||
| -rw-r--r-- | source3/modules/onefs_open.c | 4 | ||||
| -rw-r--r-- | source3/smbd/open.c | 22 |
3 files changed, 21 insertions, 8 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index c2385c9313..fe4a2c1e37 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -4890,7 +4890,8 @@ NTSTATUS create_file_default(connection_struct *conn, NTSTATUS get_relative_fid_filename(connection_struct *conn, struct smb_request *req, uint16_t root_dir_fid, - struct smb_filename *smb_fname); + const struct smb_filename *smb_fname, + struct smb_filename **smb_fname_out); /* The following definitions come from smbd/oplock.c */ diff --git a/source3/modules/onefs_open.c b/source3/modules/onefs_open.c index fb4b89a88e..c9372e57de 100644 --- a/source3/modules/onefs_open.c +++ b/source3/modules/onefs_open.c @@ -2093,11 +2093,13 @@ NTSTATUS onefs_create_file(vfs_handle_struct *handle, /* Get the file name if root_dir_fid was specified. */ if (root_dir_fid != 0) { + struct smb_filename *smb_fname_out = NULL; status = get_relative_fid_filename(conn, req, root_dir_fid, - smb_fname); + smb_fname, &smb_fname_out); if (!NT_STATUS_IS_OK(status)) { goto fail; } + smb_fname = smb_fname_out; } /* All file access must go through check_name() */ diff --git a/source3/smbd/open.c b/source3/smbd/open.c index 2c7764ab14..56c7d03a2c 100644 --- a/source3/smbd/open.c +++ b/source3/smbd/open.c @@ -3431,7 +3431,8 @@ static NTSTATUS create_file_unixpath(connection_struct *conn, NTSTATUS get_relative_fid_filename(connection_struct *conn, struct smb_request *req, uint16_t root_dir_fid, - struct smb_filename *smb_fname) + const struct smb_filename *smb_fname, + struct smb_filename **smb_fname_out) { files_struct *dir_fsp; char *parent_fname = NULL; @@ -3519,16 +3520,23 @@ NTSTATUS get_relative_fid_filename(connection_struct *conn, } } - new_base_name = talloc_asprintf(smb_fname, "%s%s", parent_fname, + new_base_name = talloc_asprintf(talloc_tos(), "%s%s", parent_fname, smb_fname->base_name); if (new_base_name == NULL) { status = NT_STATUS_NO_MEMORY; goto out; } - TALLOC_FREE(smb_fname->base_name); - smb_fname->base_name = new_base_name; - status = NT_STATUS_OK; + status = filename_convert(req, + conn, + req->flags2 & FLAGS2_DFS_PATHNAMES, + new_base_name, + 0, + NULL, + smb_fname_out); + if (!NT_STATUS_IS_OK(status)) { + goto out; + } out: TALLOC_FREE(parent_fname); @@ -3579,11 +3587,13 @@ NTSTATUS create_file_default(connection_struct *conn, */ if (root_dir_fid != 0) { + struct smb_filename *smb_fname_out = NULL; status = get_relative_fid_filename(conn, req, root_dir_fid, - smb_fname); + smb_fname, &smb_fname_out); if (!NT_STATUS_IS_OK(status)) { goto fail; } + smb_fname = smb_fname_out; } /* |