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

Fix bug 7950 - Samba 3.5.x fails BASE-CREATEX_SHAREMODES_DIR smbtorture4 test

Browse Source 
We need to revalidate the pathname once re-constructed from a root fsp.

Jeremy.
This commit is contained in:
Jeremy Allison 2011-02-23 18:24:41 -08:00
parent 5ec284d152
commit 916e82823b
3 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source3/include/proto.h
View File

@ -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 */

4
source3/modules/onefs_open.c
View File

@ -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() */

22
source3/smbd/open.c
View File

@ -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;
}
/*