1
0
mirror of https://github.com/samba-team/samba.git synced 2024-12-28 07:21:54 +03:00

r17249: Ensure we only set the FILE_WRITE_DATA on O_TRUNC

in one place.
Jeremy.
(This used to be commit f326bae3e2)
This commit is contained in:
Jeremy Allison 2006-07-26 04:42:18 +00:00 committed by Gerald (Jerry) Carter
parent f6aeba37ff
commit 999b1e01e1

View File

@ -1212,14 +1212,12 @@ NTSTATUS open_file_ntcreate(connection_struct *conn,
/* If file exists replace/overwrite. If file doesn't /* If file exists replace/overwrite. If file doesn't
* exist create. */ * exist create. */
flags2 |= (O_CREAT | O_TRUNC); flags2 |= (O_CREAT | O_TRUNC);
open_access_mask |= FILE_WRITE_DATA; /* This will cause oplock breaks. */
break; break;
case FILE_OVERWRITE_IF: case FILE_OVERWRITE_IF:
/* If file exists replace/overwrite. If file doesn't /* If file exists replace/overwrite. If file doesn't
* exist create. */ * exist create. */
flags2 |= (O_CREAT | O_TRUNC); flags2 |= (O_CREAT | O_TRUNC);
open_access_mask |= FILE_WRITE_DATA; /* This will cause oplock breaks. */
break; break;
case FILE_OPEN: case FILE_OPEN:
@ -1244,7 +1242,6 @@ NTSTATUS open_file_ntcreate(connection_struct *conn,
return NT_STATUS_OBJECT_NAME_NOT_FOUND; return NT_STATUS_OBJECT_NAME_NOT_FOUND;
} }
flags2 |= O_TRUNC; flags2 |= O_TRUNC;
open_access_mask |= FILE_WRITE_DATA; /* This will cause oplock breaks. */
break; break;
case FILE_CREATE: case FILE_CREATE: