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/open.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/open.c')
| -rw-r--r-- | source3/smbd/open.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/smbd/open.c b/source3/smbd/open.c index 0834e6d3d3..e366c5fadf 100644 --- a/source3/smbd/open.c +++ b/source3/smbd/open.c @@ -58,7 +58,7 @@ NTSTATUS smb1_file_se_access_check(struct connection_struct *conn, { *access_granted = 0; - 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... */ *access_granted = access_desired; if (access_desired & SEC_FLAG_MAXIMUM_ALLOWED) { @@ -2176,7 +2176,7 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn, new_file_created = True; } - set_share_mode(lck, fsp, get_current_uid(conn), 0, + set_share_mode(lck, fsp, conn->server_info->utok.uid, 0, fsp->oplock_type); /* Handle strange delete on close create semantics. */ @@ -2641,7 +2641,7 @@ static NTSTATUS open_directory(connection_struct *conn, return status; } - set_share_mode(lck, fsp, get_current_uid(conn), 0, NO_OPLOCK); + set_share_mode(lck, fsp, conn->server_info->utok.uid, 0, NO_OPLOCK); /* For directories the delete on close bit at open time seems always to be honored on close... See test 19 in Samba4 BASE-DELETE. */ |