s3: Add a test excercising the share mode cleanup routine

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 4bd1b40b641254a3dd62e96b5764dd406152ba27..72f2c9f14e4766026e6247a05cb8af10298e0af5 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1264,6 +1264,7 @@ SMBTORTURE_OBJ1 = torture/torture.o torture/nbio.o torture/scanner.o torture/uta
                torture/test_posix_append.o \
                torture/test_smb2.o \
                torture/test_authinfo_structs.o \
+               torture/test_cleanup.o \
                torture/t_strappend.o
 
 SMBTORTURE_OBJ = $(SMBTORTURE_OBJ1) $(PARAM_OBJ) $(TLDAP_OBJ) \

diff --git a/source3/torture/proto.h b/source3/torture/proto.h
index e971247c5ced153fe72cc54a1f02fd1358466c6b..19e7a72a7066d00f8f1c5c3eeb5ac7ffa66c0ce8 100644 (file)
--- a/source3/torture/proto.h
+++ b/source3/torture/proto.h
@@ -101,5 +101,6 @@ bool run_smb2_multi_channel(int dummy);
 bool run_smb2_session_reauth(int dummy);
 bool run_local_conv_auth_info(int dummy);
 bool run_local_sprintf_append(int dummy);
+bool run_cleanup1(int dummy);
 
 #endif /* __TORTURE_H__ */

diff --git a/source3/torture/test_cleanup.c b/source3/torture/test_cleanup.c
new file mode 100644 (file)
index 0000000..7248676
--- /dev/null
+++ b/source3/torture/test_cleanup.c
@@ -0,0 +1,69 @@
+/*
+   Unix SMB/CIFS implementation.
+   Test cleanup behaviour
+   Copyright (C) Volker Lendecke 2011
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "includes.h"
+#include "torture/proto.h"
+#include "system/filesys.h"
+#include "libsmb/libsmb.h"
+#include "libcli/smb/smbXcli_base.h"
+
+bool run_cleanup1(int dummy)
+{
+       struct cli_state *cli;
+       const char *fname = "\\cleanup1";
+       uint16_t fnum;
+       NTSTATUS status;
+
+       printf("Starting cleanup1 test\n");
+
+       if (!torture_open_connection(&cli, 0)) {
+               return false;
+       }
+       status = cli_openx(cli, fname, O_RDWR|O_CREAT, DENY_ALL, &fnum);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("open of %s failed (%s)\n", fname, nt_errstr(status));
+               return false;
+       }
+       status = smbXcli_conn_samba_suicide(cli->conn, 1);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("smbXcli_conn_samba_suicide failed: %s\n",
+                      nt_errstr(status));
+               return false;
+       }
+
+       if (!torture_open_connection(&cli, 1)) {
+               return false;
+       }
+       status = cli_openx(cli, fname, O_RDWR|O_CREAT, DENY_ALL, &fnum);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("2nd open of %s failed (%s)\n", fname,
+                      nt_errstr(status));
+               return false;
+       }
+       cli_close(cli, fnum);
+
+       status = cli_unlink(cli, fname, 0);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("cli_unlink failed: %s\n", nt_errstr(status));
+               goto done;
+       }
+done:
+       torture_close_connection(cli);
+       return NT_STATUS_IS_OK(status);
+}

diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index 619f92dc6ce0717e3e6819622b021af2e3364675..9d18f72271a6d0ccca647b77e009740311e7b68c 100644 (file)
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -8879,6 +8879,7 @@ static struct {
        { "SMB2-TCON-DEPENDENCE", run_smb2_tcon_dependence },
        { "SMB2-MULTI-CHANNEL", run_smb2_multi_channel },
        { "SMB2-SESSION-REAUTH", run_smb2_session_reauth },
+       { "CLEANUP1", run_cleanup1 },
        { "LOCAL-SUBSTITUTE", run_local_substitute, 0},
        { "LOCAL-GENCACHE", run_local_gencache, 0},
        { "LOCAL-TALLOC-DICT", run_local_talloc_dict, 0},

diff --git a/source3/wscript_build b/source3/wscript_build
index 8ac6cc0d48767084ae97fbeaa698659e68abbedc..e6b23f8af7542ee250e211e18b7714045ccdeb50 100755 (executable)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -570,6 +570,7 @@ SMBTORTURE_SRC1 = '''torture/torture.c torture/nbio.c torture/scanner.c torture/
                torture/test_smb2.c
                torture/test_authinfo_structs.c
                 torture/test_smbsock_any_connect.c
+               torture/test_cleanup.c
                 torture/t_strappend.c'''
 
 SMBTORTURE_SRC = '''${SMBTORTURE_SRC1}