[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  fbe40d2 s3:smbd: fix file corruption using "write cache size != 0"
      from  10e888f smbcontrol: Use server_id_str_buf

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit fbe40d21c8e0f5bc87635e71fb828dfc5479a1ff
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu Nov 6 09:23:46 2014 +0100

    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>
    Reviewed-by: Volker Lendecke <vl at samba.org>
    
    Autobuild-User(master): Volker Lendecke <vl at samba.org>
    Autobuild-Date(master): Thu Nov  6 13:09:38 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 17cb22e..7935092 100644
--- a/source3/smbd/oplock.c
+++ b/source3/smbd/oplock.c
@@ -142,6 +142,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, SAMBA_OPLOCK_RELEASE_FLUSH);
+	delete_write_cache(fsp);
+
 	TALLOC_FREE(fsp->oplock_timeout);
 }
 


-- 
Samba Shared Repository