summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarolin Seeger <kseeger@samba.org>2008-11-17 14:02:54 +0100
committerKarolin Seeger <kseeger@samba.org>2008-11-17 14:02:54 +0100
commit6a8b50b699850ccd774a3f031ad195ce6e41da83 (patch)
tree788613b8ee7e7a6bc60dc474e48c1894aeeb656e
parent8f38ac7fd08bdea2a96d423757c16fc19d3df603 (diff)
downloadsamba-6a8b50b699850ccd774a3f031ad195ce6e41da83.tar.gz
samba-6a8b50b699850ccd774a3f031ad195ce6e41da83.tar.xz
samba-6a8b50b699850ccd774a3f031ad195ce6e41da83.zip
Revert "Second part of the fix for bug #5790 - samba returns STATUS_OBJECT_NAME_NOT_FOUND on set file disposition call."
This reverts commit e73c090b5ff624f71ce827c494cd71ca73144ba9.
-rw-r--r--source/smbd/files.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/source/smbd/files.c b/source/smbd/files.c
index b7ac58d5232..13e6dd9b288 100644
--- a/source/smbd/files.c
+++ b/source/smbd/files.c
@@ -122,12 +122,10 @@ NTSTATUS file_new(connection_struct *conn, files_struct **result)
chain_fsp = fsp;
- /* A new fsp invalidates the positive and
- negative fsp_fi_cache as the new fsp is pushed
- at the start of the list and we search from
- a cache hit to the *end* of the list. */
-
- ZERO_STRUCT(fsp_fi_cache);
+ /* A new fsp invalidates a negative fsp_fi_cache. */
+ if (fsp_fi_cache.fsp == NULL) {
+ ZERO_STRUCT(fsp_fi_cache);
+ }
*result = fsp;
return NT_STATUS_OK;