From 0ac113e5a2c1de27a9a33f75821c4fac94ff8731 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Tue, 11 Dec 2007 10:36:59 +0100 Subject: Move INTERNAL_OPEN_ONLY calculation out of the way (This used to be commit 0e96549b56e288c596ed8772197f97ffa5ade300) --- source3/smbd/open.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source3/smbd/open.c') diff --git a/source3/smbd/open.c b/source3/smbd/open.c index 0e73ba964e..4798563721 100644 --- a/source3/smbd/open.c +++ b/source3/smbd/open.c @@ -2611,10 +2611,6 @@ NTSTATUS create_file(connection_struct *conn, } } - if (req == NULL) { - oplock_request |= INTERNAL_OPEN_ONLY; - } - if ((req != NULL) && (req->flags2 & FLAGS2_DFS_PATHNAMES)) { char *resolved_fname; @@ -2660,6 +2656,10 @@ NTSTATUS create_file(connection_struct *conn, goto fail; } + if (req == NULL) { + oplock_request |= INTERNAL_OPEN_ONLY; + } + /* This is the correct thing to do (check every time) but can_delete * is expensive (it may have to read the parent directory * permissions). So for now we're not doing it unless we have a strong -- cgit