diff options
| author | Volker Lendecke <vl@samba.org> | 2007-12-11 10:36:59 +0100 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2007-12-11 16:16:54 +0100 |
| commit | 0ac113e5a2c1de27a9a33f75821c4fac94ff8731 (patch) | |
| tree | bc627b9c2496be3199a579a43d58de455c48ec0c | |
| parent | 353dba47df7b0626108d62ea9be03ae909cb96b7 (diff) | |
| download | samba-0ac113e5a2c1de27a9a33f75821c4fac94ff8731.tar.gz samba-0ac113e5a2c1de27a9a33f75821c4fac94ff8731.tar.bz2 samba-0ac113e5a2c1de27a9a33f75821c4fac94ff8731.zip | |
Move INTERNAL_OPEN_ONLY calculation out of the way
(This used to be commit 0e96549b56e288c596ed8772197f97ffa5ade300)
| -rw-r--r-- | source3/smbd/open.c | 8 |
1 files changed, 4 insertions, 4 deletions
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 |