summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2011-12-16 15:35:55 -0800
committerKarolin Seeger <kseeger@samba.org>2012-01-23 21:30:20 +0100
commit92b8b043f1491541dfad06cc9e00a66dcaf4683a (patch)
tree8f2ee8db07894f35942949352c40c69ec3d93103
parent50336617279641fc980ea08a8d9f75713b6d2719 (diff)
downloadsamba-92b8b043f1491541dfad06cc9e00a66dcaf4683a.tar.gz
First part of fix for bug #8663 - deleting a symlink fails if the symlink target is outside of the share.
Remove two unneeded check_name() calls. They have already been done in order to get here. (cherry picked from commit 8799e63b3859502e724cb870c954a0c03ce860e2)
-rw-r--r--source3/smbd/open.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 09716d906be..ab54f28c352 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -1624,11 +1624,6 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn,
}
}
- status = check_name(conn, smb_fname->base_name);
- if (!NT_STATUS_IS_OK(status)) {
- return status;
- }
-
if (!posix_open) {
new_dos_attributes &= SAMBA_ATTRIBUTES_MASK;
if (file_existed) {
@@ -3649,13 +3644,6 @@ NTSTATUS create_file_default(connection_struct *conn,
}
}
- /* All file access must go through check_name() */
-
- status = check_name(conn, smb_fname->base_name);
- if (!NT_STATUS_IS_OK(status)) {
- goto fail;
- }
-
if (stream_name && is_ntfs_default_stream_smb_fname(smb_fname)) {
int ret;
smb_fname->stream_name = NULL;