[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-162-gbadad0a

Jeremy Allison jra at samba.org
Thu Mar 5 00:58:29 GMT 2009


The branch, master has been updated
       via  badad0a6a6d2b0f0a34b09f83d0ea25596dc9bf6 (commit)
      from  ebe5b2835331ab259dd32bf6dc574ae999e2d36d (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit badad0a6a6d2b0f0a34b09f83d0ea25596dc9bf6
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Mar 4 16:57:37 2009 -0800

    Fix bug #6154 - zfs does not honor admin users.
    Jeremy

-----------------------------------------------------------------------

Summary of changes:
 source3/smbd/file_access.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/file_access.c b/source3/smbd/file_access.c
index fe7ba1c..abffcd2 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 |


-- 
Samba Shared Repository


More information about the samba-cvs mailing list