summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2008-05-09 11:14:45 -0700
committerJeremy Allison <jra@samba.org>2008-05-09 11:14:45 -0700
commit3f76504d92e0bde89472e569acd64494729778a5 (patch)
tree2045904f60ce0a3e205397599071341c1c85975b /source3/smbd
parent1830d6b1599c93b81fd79b4cdc982f20263e1249 (diff)
downloadsamba-3f76504d92e0bde89472e569acd64494729778a5.tar.gz
samba-3f76504d92e0bde89472e569acd64494729778a5.tar.bz2
samba-3f76504d92e0bde89472e569acd64494729778a5.zip
Remove a couple of uses of SMB_VFS_GET_NT_ACL(), use
SMB_VFS_FGET_NT_ACL instead. I'd like to ultimately remove SMB_VFS_GET_NT_ACL. Jeremy. (This used to be commit 4221937b68e2414295279b27c5f12a80f826ed4b)
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/nttrans.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index 362823d78a..bd34b5a361 100644
--- a/source3/smbd/nttrans.c
+++ b/source3/smbd/nttrans.c
@@ -1612,14 +1612,8 @@ static void call_nt_transact_query_security_desc(connection_struct *conn,
if (!lp_nt_acl_support(SNUM(conn))) {
status = get_null_nt_acl(talloc_tos(), &psd);
} else {
- if (fsp->fh->fd != -1) {
- status = SMB_VFS_FGET_NT_ACL(
- fsp, security_info_wanted, &psd);
- }
- else {
- status = SMB_VFS_GET_NT_ACL(
- conn, fsp->fsp_name, security_info_wanted, &psd);
- }
+ status = SMB_VFS_FGET_NT_ACL(
+ fsp, security_info_wanted, &psd);
}
if (!NT_STATUS_IS_OK(status)) {