diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-08-03 17:22:33 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:31:06 -0500 |
| commit | 5ef83290bc4db2ac409b0de32f459aef3c52faeb (patch) | |
| tree | 7a4808e4c9a9c2229415cdaf79e8a3f1df6ead28 /source4/ntvfs/posix/pvfs_open.c | |
| parent | d4c4f16f944f33188077200c69df0c876bdf8c7f (diff) | |
| download | samba-5ef83290bc4db2ac409b0de32f459aef3c52faeb.tar.gz samba-5ef83290bc4db2ac409b0de32f459aef3c52faeb.tar.bz2 samba-5ef83290bc4db2ac409b0de32f459aef3c52faeb.zip | |
r9007: fixed error code for setting delete on close on a non-empty directory
(This used to be commit 320ab3c93b05a79b77dbbb85e9b038bb07848ba5)
Diffstat (limited to 'source4/ntvfs/posix/pvfs_open.c')
| -rw-r--r-- | source4/ntvfs/posix/pvfs_open.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source4/ntvfs/posix/pvfs_open.c b/source4/ntvfs/posix/pvfs_open.c index d0e7d82117..3ae8e2150f 100644 --- a/source4/ntvfs/posix/pvfs_open.c +++ b/source4/ntvfs/posix/pvfs_open.c @@ -1244,6 +1244,9 @@ NTSTATUS pvfs_change_create_options(struct pvfs_state *pvfs, } if (f->handle->name->dos.attrib & FILE_ATTRIBUTE_DIRECTORY) { + if (!pvfs_directory_empty(pvfs, f->handle->name)) { + return NT_STATUS_DIRECTORY_NOT_EMPTY; + } f->handle->create_options = create_options; return NT_STATUS_OK; } |