[SCM] Samba Shared Repository - branch master updated

Jeremy Allison jra at samba.org
Thu Jan 30 15:33:04 MST 2014


The branch, master has been updated
       via  9fb9438 selftets: durable-open.reopen4 succeeds now.
       via  af360ed s4:torture:smb2: fix durable-open.reopen4
      from  0b23345 s3:smbd: skip empty records in smbXsrv_open_cleanup()

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


- Log -----------------------------------------------------------------
commit 9fb943819c2e6f62cbbad7f00d1ebfd24536d983
Author: Michael Adam <obnox at samba.org>
Date:   Tue Jan 28 23:56:06 2014 +0100

    selftets: durable-open.reopen4 succeeds now.
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Thu Jan 30 23:32:13 CET 2014 on sn-devel-104

commit af360ede0e9fad6a01807739f57c2312f37874c0
Author: Michael Adam <obnox at samba.org>
Date:   Tue Jan 28 23:43:58 2014 +0100

    s4:torture:smb2: fix durable-open.reopen4
    
    We currently don't support durable handles with delete-on-close:
    with delete-on-close, we close a durable handle with delete-on-close
    set upon disconnect.
    
    This patch adapts the test to behave accordingly,
    i.e. don't use delete-on-close...
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

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

Summary of changes:
 selftest/knownfail                  |    1 -
 source4/torture/smb2/durable_open.c |    1 -
 2 files changed, 0 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/selftest/knownfail b/selftest/knownfail
index 81f737a..65f9fd2 100644
--- a/selftest/knownfail
+++ b/selftest/knownfail
@@ -188,7 +188,6 @@
 ^samba3.smb2.notify.dir
 ^samba3.smb2.notify.rec
 ^samba3.smb2.durable-open.lock-lease
-^samba3.smb2.durable-open.reopen4
 ^samba3.smb2.durable-open.delete_on_close2
 ^samba3.smb2.durable-v2-open.open-lease
 ^samba3.smb2.durable-v2-open.persistent-open-lease
diff --git a/source4/torture/smb2/durable_open.c b/source4/torture/smb2/durable_open.c
index 23425c8..c3d63d1 100644
--- a/source4/torture/smb2/durable_open.c
+++ b/source4/torture/smb2/durable_open.c
@@ -1297,7 +1297,6 @@ static bool test_durable_open_reopen4(struct torture_context *tctx,
 				 smb2_util_share_access(""),
 				 smb2_util_oplock_level("b"));
 	io1.in.durable_open = true;
-	io1.in.create_options |= NTCREATEX_OPTIONS_DELETE_ON_CLOSE;
 
 	status = smb2_create(tree, mem_ctx, &io1);
 	CHECK_STATUS(status, NT_STATUS_OK);


-- 
Samba Shared Repository


More information about the samba-cvs mailing list