sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-23 09:57:40 +03:00
Code

r17295: Back out the become_root_uid_only change on the POSIX

Browse Source 
acls code. I'm pretty sure this was safe, but become_root()
does other things to the token stack that become_root_uid_only()
does not, and as we're going into a vfs redirectred function
I decided it wasn't safe for now.
Jeremy.
This commit is contained in:
Jeremy Allison 2006-07-28 23:09:12 +00:00 committed by Gerald (Jerry) Carter
parent 4143aa83c0
commit b3e0f45488
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
source/smbd/posix_acls.c
View File

@ -2458,9 +2458,9 @@ static BOOL set_canon_ace_list(files_struct *fsp, canon_ace *the_ace, BOOL defau
DEBUG(5,("set_canon_ace_list: acl group control on and current user in file %s primary group.\n",
fsp->fsp_name ));
become_root_uid_only();
become_root();
sret = SMB_VFS_SYS_ACL_SET_FILE(conn, fsp->fsp_name, the_acl_type, the_acl);
unbecome_root_uid_only();
unbecome_root();
if (sret == 0) {
ret = True;
}
@ -2489,9 +2489,9 @@ static BOOL set_canon_ace_list(files_struct *fsp, canon_ace *the_ace, BOOL defau
DEBUG(5,("set_canon_ace_list: acl group control on and current user in file %s primary group.\n",
fsp->fsp_name ));
become_root_uid_only();
become_root();
sret = SMB_VFS_SYS_ACL_SET_FD(fsp, fsp->fh->fd, the_acl);
unbecome_root_uid_only();
unbecome_root();
if (sret == 0) {
ret = True;
}
@ -3018,10 +3018,10 @@ static int try_chown(connection_struct *conn, const char *fname, uid_t uid, gid_
/* Case (3) */
( has_restore_priv ) ) {
become_root_uid_only();
become_root();
/* Keep the current file gid the same - take ownership doesn't imply group change. */
ret = SMB_VFS_CHOWN(conn, fname, uid, (gid_t)-1);
unbecome_root_uid_only();
unbecome_root();
return ret;
}
}
@ -3045,10 +3045,10 @@ static int try_chown(connection_struct *conn, const char *fname, uid_t uid, gid_
*/
uid = current_user.ut.uid;
become_root_uid_only();
become_root();
/* Keep the current file gid the same. */
ret = SMB_VFS_FCHOWN(fsp, fsp->fh->fd, uid, (gid_t)-1);
unbecome_root_uid_only();
unbecome_root();
close_file_fchmod(fsp);
@ -3226,9 +3226,9 @@ BOOL set_nt_acl(files_struct *fsp, uint32 security_info_sent, SEC_DESC *psd)
"current user in file %s primary group. Override delete_def_acl\n",
fsp->fsp_name ));
become_root_uid_only();
become_root();
sret = SMB_VFS_SYS_ACL_DELETE_DEF_FILE(conn, fsp->fsp_name);
unbecome_root_uid_only();
unbecome_root();
}
if (sret == -1) {
@ -3273,9 +3273,9 @@ BOOL set_nt_acl(files_struct *fsp, uint32 security_info_sent, SEC_DESC *psd)
"current user in file %s primary group. Override chmod\n",
fsp->fsp_name ));
become_root_uid_only();
become_root();
sret = SMB_VFS_CHMOD(conn,fsp->fsp_name, posix_perms);
unbecome_root_uid_only();
unbecome_root();
}
if (sret == -1) {

1
source/smbd/uid.c
View File

@ -420,4 +420,3 @@ BOOL unbecome_user(void)
pop_conn_ctx();
return True;
}