sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-08 04:58:40 +03:00
Code

Fix logic error in try_chown - we shouldn't arbitrarily chown

Browse Source 
to ourselves unless that was passed in.
Jeremy.
This commit is contained in:
Jeremy Allison 2009-01-22 15:57:41 -08:00
parent 81533e2d39
commit 634cc6b64a
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source3/modules/vfs_aixacl2.c
View File

@ -25,8 +25,6 @@
#define AIXACL2_MODULE_NAME "aixacl2"
extern int try_chown(connection_struct *conn, const char *fname, uid_t uid, gid_t gid);
extern SMB_ACL_T aixacl_to_smbacl( struct acl *file_acl);
extern struct acl *aixacl_smb_to_aixacl(SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl);

15
source3/smbd/posix_acls.c
View File

@ -3187,6 +3187,15 @@ int try_chown(connection_struct *conn, const char *fname, uid_t uid, gid_t gid)
return -1;
}
/* only allow chown to the current user. This is more secure,
and also copes with the case where the SID in a take ownership ACL is
a local SID on the users workstation
*/
if (uid != current_user.ut.uid) {
errno = EPERM;
return -1;
}
if (SMB_VFS_STAT(conn,fname,&st)) {
return -1;
}
@ -3195,12 +3204,6 @@ int try_chown(connection_struct *conn, const char *fname, uid_t uid, gid_t gid)
return -1;
}
/* only allow chown to the current user. This is more secure,
and also copes with the case where the SID in a take ownership ACL is
a local SID on the users workstation
*/
uid = current_user.ut.uid;
become_root();
/* Keep the current file gid the same. */
ret = SMB_VFS_FCHOWN(fsp, uid, (gid_t)-1);