summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2011-12-15 16:31:51 -0800
committerJeremy Allison <jra@samba.org>2011-12-15 16:31:51 -0800
commit8eca2231238d0088b8a25409fdaf5fb2e837b330 (patch)
treefd58c0801f63b8782a3973a74120691d2541fb38
parentd62de8d83e451a8c562dd59d8599c2a325c7ac1f (diff)
downloadsamba-8eca2231238d0088b8a25409fdaf5fb2e837b330.tar.gz
samba-8eca2231238d0088b8a25409fdaf5fb2e837b330.tar.bz2
samba-8eca2231238d0088b8a25409fdaf5fb2e837b330.zip
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.
-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 433bc09022..5abc64dc99 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -1723,11 +1723,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) {
@@ -3846,13 +3841,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;