summaryrefslogtreecommitdiff
path: root/source3/modules
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2009-12-02 18:06:40 -0800
committerJeremy Allison <jra@samba.org>2009-12-02 18:06:40 -0800
commitdfcc4115ddc7c3bf7a69d7eb747c096cd217b8a6 (patch)
tree6e5ae1c21fc1f0c7c1b0502a707a30a3b6f0b2be /source3/modules
parent76be0f6a11dfadc94923a81ef984b6234db5c0b0 (diff)
downloadsamba-dfcc4115ddc7c3bf7a69d7eb747c096cd217b8a6.tar.gz
samba-dfcc4115ddc7c3bf7a69d7eb747c096cd217b8a6.tar.bz2
samba-dfcc4115ddc7c3bf7a69d7eb747c096cd217b8a6.zip
Remove unneeded argument from can_set_delete_on_close(). Ensure
can_set_delete_on_close() is correctly called before any setting of the disposition bit (clean up the do_unlink() call). Jeremy.
Diffstat (limited to 'source3/modules')
-rw-r--r--source3/modules/onefs_open.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/modules/onefs_open.c b/source3/modules/onefs_open.c
index fd12fff58c..b96c4b6afb 100644
--- a/source3/modules/onefs_open.c
+++ b/source3/modules/onefs_open.c
@@ -1328,7 +1328,7 @@ NTSTATUS onefs_open_file_ntcreate(connection_struct *conn,
/* Handle strange delete on close create semantics. */
if (create_options & FILE_DELETE_ON_CLOSE) {
- status = can_set_delete_on_close(fsp, True, new_dos_attributes);
+ status = can_set_delete_on_close(fsp, new_dos_attributes);
if (!NT_STATUS_IS_OK(status)) {
/* Remember to delete the mode we just added. */
@@ -1686,7 +1686,7 @@ static NTSTATUS onefs_open_directory(connection_struct *conn,
* always to be honored on close... See test 19 in Samba4 BASE-DELETE.
*/
if (create_options & FILE_DELETE_ON_CLOSE) {
- status = can_set_delete_on_close(fsp, True, 0);
+ status = can_set_delete_on_close(fsp, 0);
if (!NT_STATUS_IS_OK(status) &&
!NT_STATUS_EQUAL(status, NT_STATUS_DIRECTORY_NOT_EMPTY)) {
TALLOC_FREE(lck);