From 5ef83290bc4db2ac409b0de32f459aef3c52faeb Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 3 Aug 2005 17:22:33 +0000
Subject: r9007: fixed error code for setting delete on close on a non-empty
 directory (This used to be commit 320ab3c93b05a79b77dbbb85e9b038bb07848ba5)

---
 source4/ntvfs/posix/pvfs_open.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'source4/ntvfs/posix/pvfs_open.c')

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;
 	}
-- 
cgit