[SCM] Samba Shared Repository - branch v4-0-test updated

[Karolin Seeger]

The branch, v4-0-test has been updated
       via  7e486b9 s3:smbd: fix file corruption using "write cache size != 0"
      from  1b0da1d spoolss: fix handling of bad EnumJobs levels

https://git.samba.org/?p=samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit 7e486b942c7e5cd923bb9ced6b7bc9649bc7100e
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Nov 7 15:57:40 2014 -0800

    s3:smbd: fix file corruption using "write cache size != 0"
    
    A client can:
    - open a handle (h1)
    - write some data to h1.
    - open a 2nd handle h2 (downgrades both handles to level II)
    - try to read the data on h2 (this gets old data)
    
    Bug: https://bugzilla.samba.org/show_bug.cgi?id=10921
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    
    Autobuild-User(v4-0-test): Karolin Seeger <kseeger at samba.org>
    Autobuild-Date(v4-0-test): Sun Nov  9 22:51:19 CET 2014 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 source3/smbd/oplock.c | 3 +++
 1 file changed, 3 insertions(+)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c
index 95d88ef..045fd469 100644
--- a/source3/smbd/oplock.c
+++ b/source3/smbd/oplock.c
@@ -151,6 +151,9 @@ static void downgrade_file_oplock(files_struct *fsp)
 	sconn->oplocks.level_II_open++;
 	fsp->sent_oplock_break = NO_BREAK_SENT;
 
+	flush_write_cache(fsp, OPLOCK_RELEASE_FLUSH);
+	delete_write_cache(fsp);
+
 	TALLOC_FREE(fsp->oplock_timeout);
 }
 


-- 
Samba Shared Repository