[SCM] Samba Shared Repository - branch master updated

Jeremy Allison jra at samba.org
Tue Dec 29 07:35:03 UTC 2015


The branch, master has been updated
       via  73f01cd torture:smb2: fix copy'n'paste error in durable-open:open2:lease test
      from  1be7e8b smbd: remove function name from a DBG_INFO in a recent commit

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


- Log -----------------------------------------------------------------
commit 73f01cd2f11029bde5cd789f1923342cbb1b065a
Author: Michael Adam <obnox at samba.org>
Date:   Tue Dec 29 00:44:11 2015 +0100

    torture:smb2: fix copy'n'paste error in durable-open:open2:lease test
    
    Checking against the correct smb2_create object also lets us
    check the correct create action (EXISTED vs CREATED).
    
    Observed when this showed up in flakey test results.
    
    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): Tue Dec 29 08:34:03 CET 2015 on sn-devel-144

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

Summary of changes:
 source4/torture/smb2/durable_open.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


Changeset truncated at 500 lines:

diff --git a/source4/torture/smb2/durable_open.c b/source4/torture/smb2/durable_open.c
index bb32f96..fe0a326 100644
--- a/source4/torture/smb2/durable_open.c
+++ b/source4/torture/smb2/durable_open.c
@@ -2112,7 +2112,7 @@ static bool test_durable_open_open2_lease(struct torture_context *tctx,
 	status = smb2_create(tree2, mem_ctx, &io2);
 	CHECK_STATUS(status, NT_STATUS_OK);
 	h2 = io2.out.file.handle;
-	CHECK_CREATED(&io1, CREATED, FILE_ATTRIBUTE_ARCHIVE);
+	CHECK_CREATED(&io2, EXISTED, FILE_ATTRIBUTE_ARCHIVE);
 
 	/* Reconnect */
 	if (!torture_smb2_connection_ext(tctx, 0, &options, &tree1)) {


-- 
Samba Shared Repository



More information about the samba-cvs mailing list