diff options
| author | Jeremy Allison <jra@samba.org> | 2010-03-15 10:33:09 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2010-03-15 14:48:54 -0700 |
| commit | 4b85a0ea7fe036347b9fe5c725e55b043f75ccb4 (patch) | |
| tree | 33c588f05e060adaf709cdbd42ee1bae86d59d32 /source3/smbd/file_access.c | |
| parent | 83b9e12513984af8b372f5558043ed0f65d832fd (diff) | |
| download | samba-4b85a0ea7fe036347b9fe5c725e55b043f75ccb4.tar.gz samba-4b85a0ea7fe036347b9fe5c725e55b043f75ccb4.tar.bz2 samba-4b85a0ea7fe036347b9fe5c725e55b043f75ccb4.zip | |
Rever e80ceb1d7355c8c46a2ed90d5721cf367640f4e8 "Remove more uses of "extern struct current_user current_user;"."
As requested by Volker, split this into smaller commits.
Jeremy.
Diffstat (limited to 'source3/smbd/file_access.c')
| -rw-r--r-- | source3/smbd/file_access.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/smbd/file_access.c b/source3/smbd/file_access.c index 5c3089ede6..631efce677 100644 --- a/source3/smbd/file_access.c +++ b/source3/smbd/file_access.c @@ -35,7 +35,7 @@ bool can_access_file_acl(struct connection_struct *conn, struct security_descriptor *secdesc = NULL; bool ret; - if (get_current_uid(conn) == (uid_t)0) { + if (conn->server_info->utok.uid == 0 || conn->admin_user) { /* I'm sorry sir, I didn't know you were root... */ return true; } @@ -111,7 +111,7 @@ bool can_delete_file_in_directory(connection_struct *conn, ret = false; goto out; } - if (get_current_uid(conn) == (uid_t)0) { + if (conn->server_info->utok.uid == 0 || conn->admin_user) { /* I'm sorry sir, I didn't know you were root... */ ret = true; goto out; @@ -195,7 +195,7 @@ bool can_access_file_data(connection_struct *conn, DEBUG(10,("can_access_file_data: requesting 0x%x on file %s\n", (unsigned int)access_mask, smb_fname_str_dbg(smb_fname))); - if (get_current_uid(conn) == (uid_t)0) { + if (conn->server_info->utok.uid == 0 || conn->admin_user) { /* I'm sorry sir, I didn't know you were root... */ return True; } @@ -203,7 +203,7 @@ bool can_access_file_data(connection_struct *conn, SMB_ASSERT(VALID_STAT(smb_fname->st)); /* Check primary owner access. */ - if (get_current_uid(conn) == smb_fname->st.st_ex_uid) { + if (conn->server_info->utok.uid == smb_fname->st.st_ex_uid) { switch (access_mask) { case FILE_READ_DATA: return (smb_fname->st.st_ex_mode & S_IRUSR) ? |