summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2008-01-11 12:35:04 +0100
committerVolker Lendecke <vl@samba.org>2008-01-12 20:11:10 +0100
commitb36a78837f2bb16725c39e42296015c61f1c5910 (patch)
treee48294bdd34f027dc7974d4cde4f6c89157d06dc
parent4c0ca860515a799ddcda3804fe4c2080d1df9b80 (diff)
downloadsamba-b36a78837f2bb16725c39e42296015c61f1c5910.tar.gz
samba-b36a78837f2bb16725c39e42296015c61f1c5910.tar.bz2
samba-b36a78837f2bb16725c39e42296015c61f1c5910.zip
delete on close even prevents stat opens
(This used to be commit 85fe7f3f6ed4aae76e5cf31ab689b2dfacfd74de)
-rw-r--r--source3/smbd/open.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index d1679209bb..9d48bcc98b 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -598,12 +598,6 @@ static NTSTATUS open_mode_check(connection_struct *conn,
}
*file_existed = True;
-
- if (is_stat_open(access_mask)) {
- /* Stat open that doesn't trigger oplock breaks or share mode
- * checks... ! JRA. */
- return NT_STATUS_OK;
- }
/* A delete on close prohibits everything */
@@ -611,6 +605,12 @@ static NTSTATUS open_mode_check(connection_struct *conn,
return NT_STATUS_DELETE_PENDING;
}
+ if (is_stat_open(access_mask)) {
+ /* Stat open that doesn't trigger oplock breaks or share mode
+ * checks... ! JRA. */
+ return NT_STATUS_OK;
+ }
+
/*
* Check if the share modes will give us access.
*/