diff options
| author | Andrew Tridgell <tridge@samba.org> | 2011-12-01 13:40:49 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2011-12-01 05:14:49 +0100 |
| commit | 3c4af39aa506a25fc6d6753dbe34e4e1c0dd0b43 (patch) | |
| tree | 7ac56983f5a5d2d2de177cc21f056270d892334c /source4/ntvfs/posix/pvfs_rename.c | |
| parent | d1274f7f6236b47a1c6aa1737b054ed521d31b67 (diff) | |
| download | samba-3c4af39aa506a25fc6d6753dbe34e4e1c0dd0b43.tar.gz samba-3c4af39aa506a25fc6d6753dbe34e4e1c0dd0b43.tar.bz2 samba-3c4af39aa506a25fc6d6753dbe34e4e1c0dd0b43.zip | |
s4-ntvfs: added allow_override check based on use of NT ACL
This disables the posix permission override if the calculated
permissions did not come from a NT ACL.
Autobuild-User: Andrew Tridgell <tridge@samba.org>
Autobuild-Date: Thu Dec 1 05:14:49 CET 2011 on sn-devel-104
Diffstat (limited to 'source4/ntvfs/posix/pvfs_rename.c')
| -rw-r--r-- | source4/ntvfs/posix/pvfs_rename.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source4/ntvfs/posix/pvfs_rename.c b/source4/ntvfs/posix/pvfs_rename.c index 5296811f02..432716130c 100644 --- a/source4/ntvfs/posix/pvfs_rename.c +++ b/source4/ntvfs/posix/pvfs_rename.c @@ -37,7 +37,8 @@ NTSTATUS pvfs_do_rename(struct pvfs_state *pvfs, uint32_t mask; NTSTATUS status; - if (pvfs_sys_rename(pvfs, name1->full_name, name2) == -1) { + if (pvfs_sys_rename(pvfs, name1->full_name, name2, + name1->allow_override) == -1) { return pvfs_map_errno(pvfs, errno); } @@ -624,7 +625,7 @@ static NTSTATUS pvfs_rename_nt(struct ntvfs_module_context *ntvfs, case RENAME_FLAG_COPY: status = pvfs_access_check_parent(pvfs, req, name2, SEC_DIR_ADD_FILE); NT_STATUS_NOT_OK_RETURN(status); - return pvfs_copy_file(pvfs, name1, name2); + return pvfs_copy_file(pvfs, name1, name2, name1->allow_override && name2->allow_override); case RENAME_FLAG_MOVE_CLUSTER_INFORMATION: DEBUG(3,(__location__ ": Invalid rename cluster for %s\n", |