[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-163-gc8ea9d1

[Jeremy Allison]

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

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


- Log -----------------------------------------------------------------
commit c8ea9d1f13096cd7f51e5972915a61ca65b56ac3
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Mar 4 17:17:43 2009 -0800

    Second part of fix for #6154, ensure we return max access
    if admin user.
    Jeremy.

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

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


Changeset truncated at 500 lines:

diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 569c260..acd3475 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -76,6 +76,15 @@ static NTSTATUS check_open_rights(struct connection_struct *conn,
 
 	*access_granted = 0;
 
+	if (conn->server_info->utok.uid == 0 || conn->admin_user) {
+		/* I'm sorry sir, I didn't know you were root... */
+		*access_granted = access_mask;
+		if (access_mask & SEC_FLAG_MAXIMUM_ALLOWED) {
+			*access_granted |= FILE_GENERIC_ALL;
+		}
+		return NT_STATUS_OK;
+	}
+
 	status = SMB_VFS_GET_NT_ACL(conn, fname,
 			(OWNER_SECURITY_INFORMATION |
 			GROUP_SECURITY_INFORMATION |


-- 
Samba Shared Repository