diff options
| author | Andrew Tridgell <tridge@samba.org> | 2004-12-21 11:44:32 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:07:33 -0500 |
| commit | a66a985cde1606d0ed6f66f2dc80357b0f7d3363 (patch) | |
| tree | f699472e80bc6b48edaebc8b1e15f3d6cbc3268e /source4/ntvfs/posix/pvfs_open.c | |
| parent | de2ccc5ca93e0a0476aa829afd987cc043479e91 (diff) | |
| download | samba-a66a985cde1606d0ed6f66f2dc80357b0f7d3363.tar.gz samba-a66a985cde1606d0ed6f66f2dc80357b0f7d3363.tar.bz2 samba-a66a985cde1606d0ed6f66f2dc80357b0f7d3363.zip | |
r4314: added ACL checking on unlink
(This used to be commit f25c469693517ed993e0379d8b07cd7eb235a669)
Diffstat (limited to 'source4/ntvfs/posix/pvfs_open.c')
| -rw-r--r-- | source4/ntvfs/posix/pvfs_open.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/source4/ntvfs/posix/pvfs_open.c b/source4/ntvfs/posix/pvfs_open.c index 7cb8a5d90c..34052fc44a 100644 --- a/source4/ntvfs/posix/pvfs_open.c +++ b/source4/ntvfs/posix/pvfs_open.c @@ -1211,7 +1211,9 @@ NTSTATUS pvfs_change_create_options(struct pvfs_state *pvfs, determine if a file can be deleted, or if it is prevented by an already open file */ -NTSTATUS pvfs_can_delete(struct pvfs_state *pvfs, struct pvfs_filename *name) +NTSTATUS pvfs_can_delete(struct pvfs_state *pvfs, + struct smbsrv_request *req, + struct pvfs_filename *name) { NTSTATUS status; DATA_BLOB key; @@ -1228,6 +1230,10 @@ NTSTATUS pvfs_can_delete(struct pvfs_state *pvfs, struct pvfs_filename *name) NTCREATEX_OPTIONS_DELETE_ON_CLOSE, SEC_STD_DELETE); + if (NT_STATUS_IS_OK(status)) { + status = pvfs_access_check_simple(pvfs, req, name, SEC_STD_DELETE); + } + return status; } |