[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1434-g1b223ee

[Tim Prouty]

The branch, master has been updated
       via  1b223eeb5950c10e90d9672315635c5b171b3d9e (commit)
      from  651fb412a8092a93348621605b8d26396e061350 (commit)

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


- Log -----------------------------------------------------------------
commit 1b223eeb5950c10e90d9672315635c5b171b3d9e
Author: Tim Prouty <tprouty at samba.org>
Date:   Mon May 4 13:26:02 2009 -0700

    s3 torture: Only close if open was successful

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

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


Changeset truncated at 500 lines:

diff --git a/source3/torture/denytest.c b/source3/torture/denytest.c
index e5cd5a2..66a1c9f 100644
--- a/source3/torture/denytest.c
+++ b/source3/torture/denytest.c
@@ -1470,8 +1470,12 @@ bool torture_denytest1(int dummy)
 			       resultstr(denytable1[i].result));
 		}
 
-		cli_close(cli1, fnum1);
-		cli_close(cli1, fnum2);
+		if (NT_STATUS_IS_OK(ret1)) {
+			cli_close(cli1, fnum1);
+		}
+		if (NT_STATUS_IS_OK(ret2)) {
+			cli_close(cli1, fnum2);
+		}
 	}
 
 	for (i=0;i<2;i++) {
@@ -1555,8 +1559,12 @@ bool torture_denytest2(int dummy)
 			       resultstr(denytable2[i].result));
 		}
 
-		cli_close(cli1, fnum1);
-		cli_close(cli2, fnum2);
+		if (NT_STATUS_IS_OK(ret1)) {
+			cli_close(cli1, fnum1);
+		}
+		if (NT_STATUS_IS_OK(ret2)) {
+			cli_close(cli2, fnum2);
+		}
 	}
 		
 	for (i=0;i<2;i++) {


-- 
Samba Shared Repository