diff options
| author | Volker Lendecke <vl@samba.org> | 2008-06-19 16:54:12 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2008-06-19 18:51:37 +0200 |
| commit | 40f5eab5eb515937e1b23cf6762b77c194d29b9d (patch) | |
| tree | 72ed1a0ab8ef362f84664f0d5c95c7944199c8e0 /source3/smbd/file_access.c | |
| parent | e40b6e296a91f87e0a238323fe1dbf76149487e0 (diff) | |
| download | samba-40f5eab5eb515937e1b23cf6762b77c194d29b9d.tar.gz samba-40f5eab5eb515937e1b23cf6762b77c194d29b9d.tar.bz2 samba-40f5eab5eb515937e1b23cf6762b77c194d29b9d.zip | |
Wrap the unix token info in a unix_user_token in auth_serversupplied_info
No functional change, this is a preparation for more current_user ref removal
(This used to be commit dcaedf345e62ab74ea87f0a3fa1e3199c75c5445)
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 e61a8c3a5a..84c993d06b 100644 --- a/source3/smbd/file_access.c +++ b/source3/smbd/file_access.c @@ -82,7 +82,7 @@ bool can_delete_file_in_directory(connection_struct *conn, const char *fname) if (!S_ISDIR(sbuf.st_mode)) { return False; } - if (conn->server_info->uid == 0 || conn->admin_user) { + if (conn->server_info->utok.uid == 0 || conn->admin_user) { /* I'm sorry sir, I didn't know you were root... */ return True; } @@ -104,7 +104,7 @@ bool can_delete_file_in_directory(connection_struct *conn, const char *fname) * for bug #3348. Don't assume owning sticky bit * directory means write access allowed. */ - if (conn->server_info->uid != sbuf_file.st_uid) { + if (conn->server_info->utok.uid != sbuf_file.st_uid) { return False; } } @@ -147,7 +147,7 @@ bool can_access_file_data(connection_struct *conn, const char *fname, SMB_STRUCT DEBUG(10,("can_access_file_data: requesting 0x%x on file %s\n", (unsigned int)access_mask, fname )); - if (conn->server_info->uid == 0 || conn->admin_user) { + if (conn->server_info->utok.uid == 0 || conn->admin_user) { /* I'm sorry sir, I didn't know you were root... */ return True; } @@ -160,7 +160,7 @@ bool can_access_file_data(connection_struct *conn, const char *fname, SMB_STRUCT } /* Check primary owner access. */ - if (conn->server_info->uid == psbuf->st_uid) { + if (conn->server_info->utok.uid == psbuf->st_uid) { switch (access_mask) { case FILE_READ_DATA: return (psbuf->st_mode & S_IRUSR) ? True : False; |