summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2009-03-04 16:57:37 -0800
committerJeremy Allison <jra@samba.org>2009-03-04 16:57:37 -0800
commitbadad0a6a6d2b0f0a34b09f83d0ea25596dc9bf6 (patch)
treeee786ae82345542213c275dec56ecc8af3f2fa8b /source3
parentebe5b2835331ab259dd32bf6dc574ae999e2d36d (diff)
downloadsamba-badad0a6a6d2b0f0a34b09f83d0ea25596dc9bf6.tar.gz
samba-badad0a6a6d2b0f0a34b09f83d0ea25596dc9bf6.tar.bz2
samba-badad0a6a6d2b0f0a34b09f83d0ea25596dc9bf6.zip
Fix bug #6154 - zfs does not honor admin users.
Jeremy
Diffstat (limited to 'source3')
-rw-r--r--source3/smbd/file_access.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/source3/smbd/file_access.c b/source3/smbd/file_access.c
index fe7ba1cc46..abffcd2f4f 100644
--- a/source3/smbd/file_access.c
+++ b/source3/smbd/file_access.c
@@ -34,6 +34,11 @@ bool can_access_file_acl(struct connection_struct *conn,
uint32_t access_granted;
struct security_descriptor *secdesc = NULL;
+ if (conn->server_info->utok.uid == 0 || conn->admin_user) {
+ /* I'm sorry sir, I didn't know you were root... */
+ return true;
+ }
+
status = SMB_VFS_GET_NT_ACL(conn, fname,
(OWNER_SECURITY_INFORMATION |
GROUP_SECURITY_INFORMATION |