diff options
| author | Andrew Tridgell <tridge@samba.org> | 2008-07-24 14:21:52 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2008-07-24 14:21:52 +1000 |
| commit | 2ecda9fde4aa00aecd6df6ebeb162d173853d146 (patch) | |
| tree | a816fe4169858f2a7d70d4c1fb79e9c8726dc387 /source4/ntvfs | |
| parent | 809632c3df3518bff68d3be553df149c9423b433 (diff) | |
| download | samba-2ecda9fde4aa00aecd6df6ebeb162d173853d146.tar.gz samba-2ecda9fde4aa00aecd6df6ebeb162d173853d146.tar.bz2 samba-2ecda9fde4aa00aecd6df6ebeb162d173853d146.zip | |
we can't query the ACL on a new file till it exists!
(This used to be commit 4f6646f06988b1fb8be9e0c8ae833bb9792184af)
Diffstat (limited to 'source4/ntvfs')
| -rw-r--r-- | source4/ntvfs/posix/pvfs_open.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source4/ntvfs/posix/pvfs_open.c b/source4/ntvfs/posix/pvfs_open.c index 01a249ceb7..6114b2052c 100644 --- a/source4/ntvfs/posix/pvfs_open.c +++ b/source4/ntvfs/posix/pvfs_open.c @@ -631,12 +631,6 @@ static NTSTATUS pvfs_create_file(struct pvfs_state *pvfs, status = pvfs_access_check_create(pvfs, req, name, &access_mask); NT_STATUS_NOT_OK_RETURN(status); - if (io->generic.in.query_maximal_access) { - status = pvfs_access_maximal_allowed(pvfs, req, name, - &io->generic.out.maximal_access); - NT_STATUS_NOT_OK_RETURN(status); - } - /* check that the parent isn't opened with delete on close set */ status = pvfs_resolve_parent(pvfs, req, name, &parent); if (NT_STATUS_IS_OK(status)) { @@ -707,6 +701,12 @@ static NTSTATUS pvfs_create_file(struct pvfs_state *pvfs, goto cleanup_delete; } + if (io->generic.in.query_maximal_access) { + status = pvfs_access_maximal_allowed(pvfs, req, name, + &io->generic.out.maximal_access); + NT_STATUS_NOT_OK_RETURN(status); + } + /* form the lock context used for byte range locking and opendb locking */ status = pvfs_locking_key(name, f->handle, &f->handle->odb_locking_key); |