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/trans2.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/trans2.c')
| -rw-r--r-- | source3/smbd/trans2.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index 9c69b3bf2c..cd4f605c39 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -5737,10 +5737,11 @@ static NTSTATUS smb_set_file_disposition_info(connection_struct *conn, (unsigned int)dosmode, (unsigned int)delete_on_close )); - status = can_set_delete_on_close(fsp, delete_on_close, dosmode); - - if (!NT_STATUS_IS_OK(status)) { - return status; + if (delete_on_close) { + status = can_set_delete_on_close(fsp, dosmode); + if (!NT_STATUS_IS_OK(status)) { + return status; + } } /* The set is across all open files on this dev/inode pair. */ |