summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2011-02-23 18:24:41 -0800
committerJeremy Allison <jra@samba.org>2011-02-23 18:24:41 -0800
commit916e82823b56a70d7761644b38a250ea8c38e204 (patch)
tree363c4c8cdbec57151d3fac7ab8815a22d85609a0 /source3/smbd
parent5ec284d15289c5716114bff99a19890abbd45fb3 (diff)
downloadsamba-916e82823b56a70d7761644b38a250ea8c38e204.tar.gz
samba-916e82823b56a70d7761644b38a250ea8c38e204.tar.bz2
samba-916e82823b56a70d7761644b38a250ea8c38e204.zip
Fix bug 7950 - Samba 3.5.x fails BASE-CREATEX_SHAREMODES_DIR smbtorture4 test
We need to revalidate the pathname once re-constructed from a root fsp. Jeremy.
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/open.c22
1 files changed, 16 insertions, 6 deletions
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;
}
/*