The branch, v3-6-test has been updated via a72eba0 Fix bug 7704 - Possible error in fix to rpc_server/srv_spoolss_nt.c. via a8a6cbf s3: Stop using the write cache after an oplock break from ef7f474 s3: include fake_file.h in nttrans.c
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test - Log ----------------------------------------------------------------- commit a72eba09a2fcc79990e88042d02b4f2a8e1f75c6 Author: Jeremy Allison <j...@samba.org> Date: Mon Oct 4 15:48:04 2010 -0700 Fix bug 7704 - Possible error in fix to rpc_server/srv_spoolss_nt.c. From pjb1...@cam.ac.uk - Service numbers start from 0. (cherry picked from commit f1c367e60a443fe8fe40b3a7bd82d5ec2cfe669e) commit a8a6cbf02a3d8d0f178dc3501f151d2293cc1b15 Author: Volker Lendecke <v...@samba.org> Date: Sat Oct 2 17:07:00 2010 +0200 s3: Stop using the write cache after an oplock break Autobuild-User: Volker Lendecke <vlen...@samba.org> Autobuild-Date: Tue Oct 5 10:09:38 UTC 2010 on sn-devel-104 (cherry picked from commit ea08cd280cd03377cbabac8f6565719186330e44) ----------------------------------------------------------------------- Summary of changes: source3/rpc_server/srv_spoolss_nt.c | 2 +- source3/smbd/oplock.c | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c index a44753a..d767c18 100644 --- a/source3/rpc_server/srv_spoolss_nt.c +++ b/source3/rpc_server/srv_spoolss_nt.c @@ -333,7 +333,7 @@ static WERROR delete_printer_hook(TALLOC_CTX *ctx, NT_USER_TOKEN *token, const c reload_services(false); unbecome_root(); - if ( lp_servicenumber( sharename ) > 0 ) + if ( lp_servicenumber( sharename ) >= 0 ) return WERR_ACCESS_DENIED; return WERR_OK; diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c index a878f36..2348be4 100644 --- a/source3/smbd/oplock.c +++ b/source3/smbd/oplock.c @@ -119,6 +119,7 @@ void release_file_oplock(files_struct *fsp) 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