merge torture changes from Samba 3.0 -> HEAD

(This used to be commit 6e9c68217bec1e4138b5eb9a9ed85807b31bbdb8)

diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index 2ffae74016a70f104b93010f407e9f6e5b70d883..2e6bc49d55ac04e7f107cdfd03a93988e142baa1 100644 (file)
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -2792,8 +2792,8 @@ static BOOL run_oplock3(int dummy)
  */
 static BOOL run_deletetest(int dummy)
 {
-       struct cli_state *cli1;
-       struct cli_state *cli2;
+       struct cli_state *cli1 = NULL;
+       struct cli_state *cli2 = NULL;
        const char *fname = "\\delete.file";
        int fnum1 = -1;
        int fnum2 = -1;
@@ -3201,15 +3201,15 @@ static BOOL run_deletetest(int dummy)
         * intialized, because these functions don't handle
         * uninitialized connections. */
                
-       cli_close(cli1, fnum1);
-       cli_close(cli1, fnum2);
+       if (fnum1 != -1) cli_close(cli1, fnum1);
+       if (fnum2 != -1) cli_close(cli1, fnum2);
        cli_setatr(cli1, fname, 0, 0);
        cli_unlink(cli1, fname);
 
-       if (!torture_close_connection(cli1)) {
+       if (cli1 && !torture_close_connection(cli1)) {
                correct = False;
        }
-       if (!torture_close_connection(cli2)) {
+       if (cli2 && !torture_close_connection(cli2)) {
                correct = False;
        }
        return correct;