sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-23 09:57:40 +03:00
Code

s3: smbd: SMB2 close. If a file has delete on close, store the return info before deleting.

Browse Source 
If we delete the file on close, the stat after the close
will fail so we fail to return the attributes requested.

Bug 11104 - SMB2/SMB3 close response does not include attributes when requested.

https://bugzilla.samba.org/show_bug.cgi?id=11104

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Steve French <sfrench@samba.org>

Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Fri Feb 20 20:54:18 CET 2015 on sn-devel-104
This commit is contained in:
Jeremy Allison 2015-02-19 18:50:45 -08:00
parent 4a8c6988e3
commit a6008b2de7
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source3/smbd/smb2_close.c
View File

@ -237,6 +237,26 @@ static NTSTATUS smbd_smb2_close(struct smbd_smb2_request *req,
return NT_STATUS_NO_MEMORY;
}
if ((in_flags & SMB2_CLOSE_FLAGS_FULL_INFORMATION) &&
(fsp->initial_delete_on_close || fsp->delete_on_close)) {
/*
* We might be deleting the file. Ensure we
* return valid data from before the file got
* removed.
*/
setup_close_full_information(conn,
smb_fname,
posix_open,
out_creation_ts,
out_last_access_ts,
out_last_write_ts,
out_change_ts,
&flags,
&allocation_size,
&file_size,
&dos_attrs);
}
status = close_file(smbreq, fsp, NORMAL_CLOSE);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(5,("smbd_smb2_close: close_file[%s]: %s\n",