summaryrefslogtreecommitdiff
path: root/source3/smbd/file_access.c
diff options
context:
space:
mode:
authorTim Prouty <tprouty@samba.org>2009-07-21 11:35:17 -0700
committerTim Prouty <tprouty@samba.org>2009-07-21 12:04:59 -0700
commit23c703a01eddfa9103352e0ad43bc9fe39ea0c27 (patch)
tree0313bc38c66f8c61d35e008d684a240bb116d5e6 /source3/smbd/file_access.c
parent00e267008defe18475115a4300addf3cbcabff5a (diff)
downloadsamba-23c703a01eddfa9103352e0ad43bc9fe39ea0c27.tar.gz
samba-23c703a01eddfa9103352e0ad43bc9fe39ea0c27.tar.bz2
samba-23c703a01eddfa9103352e0ad43bc9fe39ea0c27.zip
s3: Remove unnecessary callers of get_full_smb_filename
This often times means explicitly denying certain operations on a stream as they are not supported or don't make sense at a particular level. At some point in the future these can be enabled, but for now it's better to remove ambiguity
Diffstat (limited to 'source3/smbd/file_access.c')
-rw-r--r--source3/smbd/file_access.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/source3/smbd/file_access.c b/source3/smbd/file_access.c
index d8fee1db06..7d0a552956 100644
--- a/source3/smbd/file_access.c
+++ b/source3/smbd/file_access.c
@@ -33,7 +33,6 @@ bool can_access_file_acl(struct connection_struct *conn,
NTSTATUS status;
uint32_t access_granted;
struct security_descriptor *secdesc = NULL;
- char *fname = NULL;
bool ret;
if (conn->server_info->utok.uid == 0 || conn->admin_user) {
@@ -41,13 +40,7 @@ bool can_access_file_acl(struct connection_struct *conn,
return true;
}
- status = get_full_smb_filename(talloc_tos(), smb_fname, &fname);
- if (!NT_STATUS_IS_OK(status)) {
- ret = false;
- goto out;
- }
-
- status = SMB_VFS_GET_NT_ACL(conn, fname,
+ status = SMB_VFS_GET_NT_ACL(conn, smb_fname->base_name,
(OWNER_SECURITY_INFORMATION |
GROUP_SECURITY_INFORMATION |
DACL_SECURITY_INFORMATION),
@@ -62,7 +55,6 @@ bool can_access_file_acl(struct connection_struct *conn,
access_mask, &access_granted);
ret = NT_STATUS_IS_OK(status);
out:
- TALLOC_FREE(fname);
TALLOC_FREE(secdesc);
return ret;
}