diff options
| author | Jeremy Allison <jra@samba.org> | 2009-12-02 18:06:40 -0800 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2009-12-08 09:15:26 +0100 |
| commit | 94cf480096be8d5210e16bd26418de4d7d82a6db (patch) | |
| tree | aebf3f747ab6008f79e9ad06752486b81028971f /source3/modules | |
| parent | 723325e66afc7aa6784e1ab5bf07c148acaceca9 (diff) | |
| download | samba-94cf480096be8d5210e16bd26418de4d7d82a6db.tar.gz samba-94cf480096be8d5210e16bd26418de4d7d82a6db.tar.xz samba-94cf480096be8d5210e16bd26418de4d7d82a6db.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.
(cherry picked from commit dfcc4115ddc7c3bf7a69d7eb747c096cd217b8a6)
(cherry picked from commit baa4727b243ff2dfb78d3dd5fd29c8e9a3667c56)
Diffstat (limited to 'source3/modules')
| -rw-r--r-- | source3/modules/onefs_open.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/modules/onefs_open.c b/source3/modules/onefs_open.c index fd12fff58ca..b96c4b6afbb 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); |