[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  4126f97 torture3: Fix bug 10687
      from  a7c5500 ctdb-tests: Fix racy test for debugging hung scripts

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


- Log -----------------------------------------------------------------
commit 4126f9716b82fa8cf24e1e9497485f18eac4f8a6
Author: Volker Lendecke <vl at samba.org>
Date:   Wed Jul 2 14:27:52 2014 +0000

    torture3: Fix bug 10687
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Thu Jul  3 19:07:15 CEST 2014 on sn-devel-104

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

Summary of changes:
 source3/torture/torture.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index f5f8f86..eb3958e 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -710,7 +710,7 @@ static bool rw_torture3(struct cli_state *c, char *lockfname)
 		{
 			status = cli_openx(c, lockfname, O_RDONLY, 
 					 DENY_NONE, &fnum);
-			if (!NT_STATUS_IS_OK(status)) {
+			if (NT_STATUS_IS_OK(status)) {
 				break;
 			}
 			smb_msleep(10);


-- 
Samba Shared Repository