[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  3ffc918 s4:torture: kernel oplocks. Fix assertion warning
      from  66052fd s3:smbd: don't use the directory cache for SMB2/3

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


- Log -----------------------------------------------------------------
commit 3ffc91813722c71f2dc4e6f3a8b3b4a2afc2e70b
Author: Jones Syue <jonessyue at qnap.com>
Date:   Fri Mar 30 08:31:06 2018 +0800

    s4:torture: kernel oplocks. Fix assertion warning
    
    Simply boolean 'ret' instead of 'ret = true'.
    
    Signed-off-by: Jones Syue <jonessyue at qnap.com>
    Reviewed-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Volker Lendecke <vl at samba.org>
    Autobuild-Date(master): Fri Mar 30 18:39:19 CEST 2018 on sn-devel-144

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

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


Changeset truncated at 500 lines:

diff --git a/source4/torture/smb2/oplock.c b/source4/torture/smb2/oplock.c
index 87d7d2ff..cb1b5ed 100644
--- a/source4/torture/smb2/oplock.c
+++ b/source4/torture/smb2/oplock.c
@@ -5032,7 +5032,7 @@ static bool test_smb2_kernel_oplocks8(struct torture_context *tctx,
 
 	/* Take the oplock locally in a sub-process. */
 	ret = wait_for_child_oplock(tctx, localdir, fname);
-	torture_assert_goto(tctx, ret = true, ret, done,
+	torture_assert_goto(tctx, ret, ret, done,
 		"Wait for child process failed.\n");
 
 	/*


-- 
Samba Shared Repository