summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2006-07-26 04:42:18 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:38:22 -0500
commit999b1e01e1ee55338ff96ddf80c3852038216108 (patch)
treed1dd19e1a80e16cb17e00df89ca1e12d38f80cd3
parentf6aeba37ff3fbfb3b7d3ff5a3878348e0b3acc39 (diff)
downloadsamba-999b1e01e1ee55338ff96ddf80c3852038216108.tar.gz
samba-999b1e01e1ee55338ff96ddf80c3852038216108.tar.bz2
samba-999b1e01e1ee55338ff96ddf80c3852038216108.zip
r17249: Ensure we only set the FILE_WRITE_DATA on O_TRUNC
in one place. Jeremy. (This used to be commit f326bae3e269046b6f087626240cddbb5dafb0e4)
-rw-r--r--source3/smbd/open.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index fd2f1ae54f..9bd4e36d5a 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -1212,14 +1212,12 @@ NTSTATUS open_file_ntcreate(connection_struct *conn,
/* If file exists replace/overwrite. If file doesn't
* exist create. */
flags2 |= (O_CREAT | O_TRUNC);
- open_access_mask |= FILE_WRITE_DATA; /* This will cause oplock breaks. */
break;
case FILE_OVERWRITE_IF:
/* If file exists replace/overwrite. If file doesn't
* exist create. */
flags2 |= (O_CREAT | O_TRUNC);
- open_access_mask |= FILE_WRITE_DATA; /* This will cause oplock breaks. */
break;
case FILE_OPEN:
@@ -1244,7 +1242,6 @@ NTSTATUS open_file_ntcreate(connection_struct *conn,
return NT_STATUS_OBJECT_NAME_NOT_FOUND;
}
flags2 |= O_TRUNC;
- open_access_mask |= FILE_WRITE_DATA; /* This will cause oplock breaks. */
break;
case FILE_CREATE: