diff options
| author | Tim Prouty <tprouty@samba.org> | 2008-12-06 16:08:35 -0800 |
|---|---|---|
| committer | Tim Prouty <tprouty@samba.org> | 2008-12-09 18:06:49 -0800 |
| commit | 7b9f6dda131f471ae61c12e7eb06d67b8f02b1cf (patch) | |
| tree | 7e948a71bc8d910f439d3d429eb9d31ccf334ade /source3/smbd | |
| parent | 4a9b092eb43603bae6190b8a5fdee20c9ebae26c (diff) | |
| download | samba-7b9f6dda131f471ae61c12e7eb06d67b8f02b1cf.tar.gz samba-7b9f6dda131f471ae61c12e7eb06d67b8f02b1cf.tar.bz2 samba-7b9f6dda131f471ae61c12e7eb06d67b8f02b1cf.zip | |
s3: [3/3]: Fix a delete on close divergence from windows and the associated torture test
This third patch cleans up by removing all of the code that is made
obsolete by the first patch. It should cause no functional changes.
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/open.c | 5 | ||||
| -rw-r--r-- | source3/smbd/reply.c | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/source3/smbd/open.c b/source3/smbd/open.c index 8882e5438b..77ad1664ef 100644 --- a/source3/smbd/open.c +++ b/source3/smbd/open.c @@ -1981,7 +1981,7 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn, } set_share_mode(lck, fsp, conn->server_info->utok.uid, 0, - fsp->oplock_type, new_file_created); + fsp->oplock_type); /* Handle strange delete on close create semantics. */ if (create_options & FILE_DELETE_ON_CLOSE) { @@ -2419,8 +2419,7 @@ static NTSTATUS open_directory(connection_struct *conn, return status; } - set_share_mode(lck, fsp, conn->server_info->utok.uid, 0, NO_OPLOCK, - True); + set_share_mode(lck, fsp, conn->server_info->utok.uid, 0, NO_OPLOCK); /* For directories the delete on close bit at open time seems always to be honored on close... See test 19 in Samba4 BASE-DELETE. */ diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index 00c744ce1a..9f7a1896b8 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -5583,8 +5583,6 @@ NTSTATUS rename_internals_fsp(connection_struct *conn, * depends on these semantics. JRA. */ - set_allow_initial_delete_on_close(lck, fsp, True); - if (create_options & FILE_DELETE_ON_CLOSE) { status = can_set_delete_on_close(fsp, True, 0); |