added simple tests for SMBchkpath and SMBioctl

(This used to be commit ca982a9f1d6485e2d388d4b2e9c13806736ad91e)

diff --git a/source3/libsmb/clifile.c b/source3/libsmb/clifile.c
index d86f36405ddaea9e084f67c11695877fda7065a9..4eb5efe193597cf800ca1f379bd54d3c75ca08a8 100644 (file)
--- a/source3/libsmb/clifile.c
+++ b/source3/libsmb/clifile.c
@@ -942,7 +942,6 @@ BOOL cli_setatr(struct cli_state *cli, const char *fname, uint16 attr, time_t t)
 /****************************************************************************
  Check for existance of a dir.
 ****************************************************************************/
-
 BOOL cli_chkpath(struct cli_state *cli, const char *path)
 {
        pstring path2;
@@ -1049,3 +1048,34 @@ int cli_ctemp(struct cli_state *cli, const char *path, char **tmp_path)
 
        return SVAL(cli->inbuf,smb_vwv0);
 }
+
+
+/* 
+   send a raw ioctl - used by the torture code
+*/
+NTSTATUS cli_raw_ioctl(struct cli_state *cli, int fnum, uint32 code, DATA_BLOB *blob)
+{
+       memset(cli->outbuf,'\0',smb_size);
+       memset(cli->inbuf,'\0',smb_size);
+
+       set_message(cli->outbuf, 3, 0, True);
+       SCVAL(cli->outbuf,smb_com,SMBioctl);
+       cli_setup_packet(cli);
+
+       SSVAL(cli->outbuf, smb_vwv0, fnum);
+       SSVAL(cli->outbuf, smb_vwv1, code>>16);
+       SSVAL(cli->outbuf, smb_vwv2, (code&0xFFFF));
+
+       cli_send_smb(cli);
+       if (!cli_receive_smb(cli)) {
+               return NT_STATUS_UNEXPECTED_NETWORK_ERROR;
+       }
+
+       if (cli_is_error(cli)) {
+               return cli_nt_error(cli);
+       }
+
+       *blob = data_blob(NULL, 0);
+
+       return NT_STATUS_OK;
+}

diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index 7bf4f10af03e6d951c6c26a78635b4faf1ae1a97..a7607aae6c246be900e2109c1613962bc6551099 100644 (file)
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -3873,6 +3873,146 @@ static void del_fn(file_info *finfo, const char *mask, void *state)
        }
 }
 
+
+/*
+  sees what IOCTLs are supported
+ */
+BOOL torture_ioctl_test(int dummy)
+{
+       static struct cli_state *cli;
+       uint16 device, function;
+       int fnum;
+       const char *fname = "\\ioctl.dat";
+       DATA_BLOB blob;
+       NTSTATUS status;
+
+       if (!torture_open_connection(&cli)) {
+               return False;
+       }
+
+       printf("starting ioctl test\n");
+
+       cli_unlink(cli, fname);
+
+       fnum = cli_open(cli, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
+       if (fnum == -1) {
+               printf("open of %s failed (%s)\n", fname, cli_errstr(cli));
+               return False;
+       }
+
+       status = cli_raw_ioctl(cli, fnum, 0x2d0000 | (0x0420<<2), &blob);
+       printf("ioctl device info: %s\n", cli_errstr(cli));
+
+       status = cli_raw_ioctl(cli, fnum, IOCTL_QUERY_JOB_INFO, &blob);
+       printf("ioctl job info: %s\n", cli_errstr(cli));
+
+       for (device=0;device<0x100;device++) {
+               printf("testing device=0x%x\n", device);
+               for (function=0;function<0x100;function++) {
+                       uint32 code = (device<<16) | function;
+
+                       status = cli_raw_ioctl(cli, fnum, code, &blob);
+
+                       if (NT_STATUS_IS_OK(status)) {
+                               printf("ioctl 0x%x OK : %d bytes\n", code, blob.length);
+                               data_blob_free(&blob);
+                       }
+               }
+       }
+
+       if (!torture_close_connection(cli)) {
+               return False;
+       }
+
+       return True;
+}
+
+
+/*
+  tries varients of chkpath
+ */
+BOOL torture_chkpath_test(int dummy)
+{
+       static struct cli_state *cli;
+       int fnum;
+       BOOL ret;
+
+       if (!torture_open_connection(&cli)) {
+               return False;
+       }
+
+       printf("starting chkpath test\n");
+
+       /* cleanup from an old run */
+       cli_rmdir(cli, "\\chkpath.dir\\dir2");
+       cli_unlink(cli, "\\chkpath.dir\\*");
+       cli_rmdir(cli, "\\chkpath.dir");
+
+       if (!cli_mkdir(cli, "\\chkpath.dir")) {
+               printf("mkdir1 failed : %s\n", cli_errstr(cli));
+               return False;
+       }
+
+       if (!cli_mkdir(cli, "\\chkpath.dir\\dir2")) {
+               printf("mkdir2 failed : %s\n", cli_errstr(cli));
+               return False;
+       }
+
+       fnum = cli_open(cli, "\\chkpath.dir\\foo.txt", O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
+       if (fnum == -1) {
+               printf("open1 failed (%s)\n", cli_errstr(cli));
+               return False;
+       }
+       cli_close(cli, fnum);
+
+       if (!cli_chkpath(cli, "\\chkpath.dir")) {
+               printf("chkpath1 failed: %s\n", cli_errstr(cli));
+               ret = False;
+       }
+
+       if (!cli_chkpath(cli, "\\chkpath.dir\\dir2")) {
+               printf("chkpath2 failed: %s\n", cli_errstr(cli));
+               ret = False;
+       }
+
+       if (!cli_chkpath(cli, "\\chkpath.dir\\foo.txt")) {
+               ret = check_error(__LINE__, cli, ERRDOS, ERRbadpath, 
+                                 NT_STATUS_NOT_A_DIRECTORY);
+       } else {
+               printf("* chkpath on a file should fail\n");
+               ret = False;
+       }
+
+       if (!cli_chkpath(cli, "\\chkpath.dir\\bar.txt")) {
+               ret = check_error(__LINE__, cli, ERRDOS, ERRbadfile, 
+                                 NT_STATUS_OBJECT_NAME_NOT_FOUND);
+       } else {
+               printf("* chkpath on a non existant file should fail\n");
+               ret = False;
+       }
+
+       if (!cli_chkpath(cli, "\\chkpath.dir\\dirxx\\bar.txt")) {
+               ret = check_error(__LINE__, cli, ERRDOS, ERRbadpath, 
+                                 NT_STATUS_OBJECT_PATH_NOT_FOUND);
+       } else {
+               printf("* chkpath on a non existent component should fail\n");
+               ret = False;
+       }
+
+       cli_rmdir(cli, "\\chkpath.dir\\dir2");
+       cli_unlink(cli, "\\chkpath.dir\\*");
+       cli_rmdir(cli, "\\chkpath.dir");
+
+       if (!torture_close_connection(cli)) {
+               return False;
+       }
+
+       return ret;
+}
+
+
+
+
 static BOOL run_dirtest1(int dummy)
 {
        int i;
@@ -4206,6 +4346,8 @@ static struct {
        {"ERRMAPEXTRACT", run_error_map_extract, 0},
        {"PIPE_NUMBER", run_pipe_number, 0},
        {"TCON2",  run_tcon2_test, 0},
+       {"IOCTL",  torture_ioctl_test, 0},
+       {"CHKPATH",  torture_chkpath_test, 0},
        {NULL, NULL, 0}};