diff options
| author | Jeremy Allison <jra@samba.org> | 2009-12-02 18:06:40 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2009-12-02 18:06:40 -0800 |
| commit | dfcc4115ddc7c3bf7a69d7eb747c096cd217b8a6 (patch) | |
| tree | 6e5ae1c21fc1f0c7c1b0502a707a30a3b6f0b2be /source3/smbd/open.c | |
| parent | 76be0f6a11dfadc94923a81ef984b6234db5c0b0 (diff) | |
| download | samba-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/smbd/open.c')
| -rw-r--r-- | source3/smbd/open.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/smbd/open.c b/source3/smbd/open.c index 72f6a00818..fd3c6103e9 100644 --- a/source3/smbd/open.c +++ b/source3/smbd/open.c @@ -2171,7 +2171,7 @@ static NTSTATUS 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. */ @@ -2634,7 +2634,7 @@ static NTSTATUS open_directory(connection_struct *conn, /* For directories the delete on close bit at open time seems 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); file_free(req, fsp); |