r21373: More tests.

(This used to be commit 83a47e30b59f5289cdcb68ba54aa236795bc42b2)

diff --git a/source4/librpc/idl/atsvc.idl b/source4/librpc/idl/atsvc.idl
index e86d48a8cdb5736faac12a9887c297f7906af7e9..75e1daa882ca1e5087e729f114f534cb7b8c972c 100644 (file)
--- a/source4/librpc/idl/atsvc.idl
+++ b/source4/librpc/idl/atsvc.idl
@@ -71,7 +71,7 @@
 
        /******************/
        /* Function: 0x00 */
-       NTSTATUS atsvc_JobAdd(
+       [public] NTSTATUS atsvc_JobAdd(
                [in,unique,string,charset(UTF16)] uint16 *servername,
                [in] atsvc_JobInfo *job_info,
                [out,ref]        uint32 *job_id
@@ -79,7 +79,7 @@
 
        /******************/
        /* Function: 0x01 */
-       NTSTATUS atsvc_JobDel(
+       [public] NTSTATUS atsvc_JobDel(
                [in,unique,string,charset(UTF16)] uint16 *servername,
                [in]    uint32 min_job_id,
                [in]    uint32 max_job_id
@@ -101,7 +101,7 @@
 
        /******************/
        /* Function: 0x02 */
-       NTSTATUS atsvc_JobEnum(
+       [public] NTSTATUS atsvc_JobEnum(
                [in,unique,string,charset(UTF16)] uint16 *servername,
                [in,out]         atsvc_enum_ctr *ctr,
                [in]         uint32 preferred_max_len,

diff --git a/source4/librpc/idl/winreg.idl b/source4/librpc/idl/winreg.idl
index 3b2c383bad9cce498c9002deb6a713a264766d2b..30827c73f1c0ab9b633c33c123e05d5cbf21b1ba 100644 (file)
--- a/source4/librpc/idl/winreg.idl
+++ b/source4/librpc/idl/winreg.idl
@@ -148,7 +148,7 @@ import "lsa.idl", "initshutdown.idl", "security.idl";
                [size_is(size/2),length_is(length/2),charset(UTF16)] uint16 *name;
        } winreg_StringBuf;
 
-       WERROR winreg_EnumKey(
+       [public] WERROR winreg_EnumKey(
                [in,ref]        policy_handle    *handle,
                [in]            uint32           enum_index,
                [in,out,ref]    winreg_StringBuf *name,

diff --git a/source4/torture/config.mk b/source4/torture/config.mk
index e3d6cef5ae9ecf870aac37e271ccee4c181d0644..e0d16b7917080b4e25d014ccdaf704eb828aa73c 100644 (file)
--- a/source4/torture/config.mk
+++ b/source4/torture/config.mk
@@ -101,7 +101,8 @@ SUBSYSTEM = torture
 INIT_FUNCTION = torture_ndr_init
 PRIVATE_PROTO_HEADER = ndr/proto.h
 OBJ_FILES = ndr/ndr.o \
-                       ndr/winreg.o
+                       ndr/winreg.o \
+                       ndr/atsvc.o
 
 [MODULE::torture_rpc]
 # TORTURE_NET and TORTURE_NBT use functions from torture_rpc...

diff --git a/source4/torture/ndr/atsvc.c b/source4/torture/ndr/atsvc.c
new file mode 100644 (file)
index 0000000..45dcb8b
--- /dev/null
+++ b/source4/torture/ndr/atsvc.c
@@ -0,0 +1,215 @@
+/* 
+   Unix SMB/CIFS implementation.
+   test suite for atsvc ndr operations
+
+   Copyright (C) Jelmer Vernooij 2007
+   
+   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 2 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, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include "includes.h"
+#include "torture/ndr/ndr.h"
+#include "librpc/gen_ndr/ndr_atsvc.h"
+
+static const uint8_t jobenum_in_data[] = {
+  0x01, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x09, 0x00, 0x00, 0x00, 0x57, 0x00, 0x49, 0x00, 0x4e, 0x00, 0x32, 0x00,
+  0x4b, 0x00, 0x44, 0x00, 0x43, 0x00, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
+  0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
+static bool jobenum_in_check(struct torture_context *tctx, 
+                                                        struct atsvc_JobEnum *r)
+{
+       torture_assert(tctx, r->in.servername != NULL, "servername ptr");
+       torture_assert_str_equal(tctx, r->in.servername, "WIN2KDC1", "servername");
+       torture_assert_int_equal(tctx, r->in.ctr->entries_read, 0, "ctr entries read");
+       torture_assert(tctx, r->in.ctr->first_entry == NULL, "ctr entries first_entry");
+       torture_assert_int_equal(tctx, r->in.preferred_max_len, -1, "preferred max len");
+       torture_assert(tctx, r->in.resume_handle != NULL, "resume handle ptr");
+       torture_assert_int_equal(tctx, *r->in.resume_handle, 0, "resume handle");
+       return true;
+}
+
+static const uint8_t jobenum_out_data[] = {
+  0x07, 0x00, 0x00, 0x00, 0x28, 0x14, 0x0a, 0x00, 0x07, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0xc0, 0xe4, 0x0a, 0x05, 0x00, 0x00, 0x00, 0x00,
+  0x02, 0x13, 0x00, 0x00, 0x40, 0x18, 0x0a, 0x00, 0x02, 0x00, 0x00, 0x00,
+  0xc0, 0xe4, 0x0a, 0x05, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0x00, 0x00,
+  0x30, 0x18, 0x0a, 0x00, 0x03, 0x00, 0x00, 0x00, 0xc0, 0xe4, 0x0a, 0x05,
+  0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0x00, 0x00, 0x20, 0x18, 0x0a, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0xc0, 0xe4, 0x0a, 0x05, 0x00, 0x00, 0x00, 0x00,
+  0x02, 0x13, 0x00, 0x00, 0x10, 0x18, 0x0a, 0x00, 0x05, 0x00, 0x00, 0x00,
+  0xc0, 0xe4, 0x0a, 0x05, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0x00, 0x00,
+  0x00, 0x18, 0x0a, 0x00, 0x06, 0x00, 0x00, 0x00, 0xc0, 0xe4, 0x0a, 0x05,
+  0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0x00, 0x00, 0xf0, 0x17, 0x0a, 0x00,
+  0x07, 0x00, 0x00, 0x00, 0xc0, 0xe4, 0x0a, 0x05, 0x00, 0x00, 0x00, 0x00,
+  0x02, 0x13, 0x00, 0x00, 0xe0, 0x17, 0x0a, 0x00, 0x08, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x66, 0x00, 0x6f, 0x00,
+  0x6f, 0x00, 0x2e, 0x00, 0x65, 0x00, 0x78, 0x00, 0x65, 0x00, 0x00, 0x00,
+  0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00,
+  0x62, 0x00, 0x61, 0x00, 0x72, 0x00, 0x2e, 0x00, 0x65, 0x00, 0x78, 0x00,
+  0x65, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x08, 0x00, 0x00, 0x00, 0x66, 0x00, 0x6f, 0x00, 0x6f, 0x00, 0x2e, 0x00,
+  0x65, 0x00, 0x78, 0x00, 0x65, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x66, 0x00, 0x6f, 0x00,
+  0x6f, 0x00, 0x2e, 0x00, 0x65, 0x00, 0x78, 0x00, 0x65, 0x00, 0x00, 0x00,
+  0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00,
+  0x66, 0x00, 0x6f, 0x00, 0x6f, 0x00, 0x2e, 0x00, 0x65, 0x00, 0x78, 0x00,
+  0x65, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x08, 0x00, 0x00, 0x00, 0x66, 0x00, 0x6f, 0x00, 0x6f, 0x00, 0x2e, 0x00,
+  0x65, 0x00, 0x78, 0x00, 0x65, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x66, 0x00, 0x6f, 0x00,
+  0x6f, 0x00, 0x2e, 0x00, 0x65, 0x00, 0x78, 0x00, 0x65, 0x00, 0x00, 0x00,
+  0x07, 0x00, 0x00, 0x00, 0xac, 0x34, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00
+};
+
+static bool jobenum_out_check(struct torture_context *tctx, 
+                                                        struct atsvc_JobEnum *r)
+{
+       torture_assert_int_equal(tctx, r->out.ctr->entries_read, 7, "entries read");
+       torture_assert(tctx, r->out.ctr->first_entry != NULL, "first entry");
+       torture_assert_int_equal(tctx, r->out.ctr->first_entry[0].job_id, 1, "job id");
+       torture_assert_int_equal(tctx, r->out.ctr->first_entry[0].job_time, 84600000, "job time");
+       torture_assert_int_equal(tctx, r->out.ctr->first_entry[0].days_of_week, 0x2, "days of week");
+       torture_assert_int_equal(tctx, r->out.ctr->first_entry[0].flags, 0x13, "flags");
+       torture_assert_str_equal(tctx, r->out.ctr->first_entry[0].command, "foo.exe", "command");
+       torture_assert(tctx, r->out.total_entries != NULL, "total entries ptr");
+       torture_assert_int_equal(tctx, *r->out.total_entries, 7, "total entries");
+       torture_assert(tctx, r->out.resume_handle, "resume handle ptr");
+       torture_assert_int_equal(tctx, *r->out.resume_handle, 0, "resume handle");
+       torture_assert_ntstatus_ok(tctx, r->out.result, "return code");
+
+       return true;
+}
+
+static const uint8_t jobadd_in_data[] = {
+  0x01, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x09, 0x00, 0x00, 0x00, 0x57, 0x00, 0x49, 0x00, 0x4e, 0x00, 0x32, 0x00,
+  0x4b, 0x00, 0x44, 0x00, 0x43, 0x00, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xc0, 0xe4, 0x0a, 0x05, 0x00, 0x00, 0x00, 0x00, 0x02, 0x11, 0x00, 0x00,
+  0x02, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x08, 0x00, 0x00, 0x00, 0x66, 0x00, 0x6f, 0x00, 0x6f, 0x00, 0x2e, 0x00,
+  0x65, 0x00, 0x78, 0x00, 0x65, 0x00, 0x00, 0x00
+};
+
+static bool jobadd_in_check(struct torture_context *tctx, 
+                                                        struct atsvc_JobAdd *r)
+{
+       torture_assert_str_equal(tctx, r->in.servername, "WIN2KDC1", "servername");
+       torture_assert_int_equal(tctx, r->in.job_info->job_time, 84600000, "time");
+       torture_assert_int_equal(tctx, r->in.job_info->days_of_month, 0, "days of month");
+       torture_assert_int_equal(tctx, r->in.job_info->days_of_week, 0x2, "days of week");
+       torture_assert_int_equal(tctx, r->in.job_info->flags, 17, "flags");
+       torture_assert_str_equal(tctx, r->in.job_info->command, "foo.exe", "command");
+
+       return true;
+}
+
+static const uint8_t jobadd_out_data[] = {
+  0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
+static bool jobadd_out_check(struct torture_context *tctx, 
+                                                        struct atsvc_JobAdd *r)
+{
+       torture_assert_int_equal(tctx, *r->out.job_id, 14, "job id");
+       torture_assert_ntstatus_ok(tctx, r->out.result, "return code");
+       return true;
+}
+
+static const uint8_t jobdel_in_data[] = {
+  0x01, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x09, 0x00, 0x00, 0x00, 0x57, 0x00, 0x49, 0x00, 0x4e, 0x00, 0x32, 0x00,
+  0x4b, 0x00, 0x44, 0x00, 0x43, 0x00, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x0e, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00
+};
+
+static bool jobdel_in_check(struct torture_context *tctx, 
+                                                        struct atsvc_JobDel *r)
+{
+       torture_assert_str_equal(tctx, r->in.servername, "WIN2KDC1", "servername");
+       torture_assert_int_equal(tctx, r->in.min_job_id, 14, "min job id");
+       torture_assert_int_equal(tctx, r->in.max_job_id, 14, "max job id");
+       return true;
+}
+
+static const uint8_t jobdel_out_data[] = {
+  0xde, 0x0e, 0x00, 0x00
+};
+
+static bool jobdel_out_check(struct torture_context *tctx, 
+                                                        struct atsvc_JobDel *r)
+{
+       /* FIXME: Check for unknown code 0x00000ede */
+       return true;
+}
+
+static const uint8_t jobgetinfo_in_data[] = {
+  0x01, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x09, 0x00, 0x00, 0x00, 0x57, 0x00, 0x49, 0x00, 0x4e, 0x00, 0x32, 0x00,
+  0x4b, 0x00, 0x44, 0x00, 0x43, 0x00, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00
+};
+
+static bool jobgetinfo_in_check(struct torture_context *tctx, 
+                                                               struct atsvc_JobGetInfo *r)
+{
+       torture_assert_str_equal(tctx, r->in.servername, "WIN2KDC1", "servername");
+       torture_assert_int_equal(tctx, r->in.job_id, 1, "job id");
+       return true;
+}
+
+static const uint8_t jobgetinfo_out_data[] = {
+  0x88, 0xe2, 0x09, 0x00, 0xc0, 0xe4, 0x0a, 0x05, 0x00, 0x00, 0x00, 0x00,
+  0x02, 0x13, 0x09, 0x00, 0x98, 0xe2, 0x09, 0x00, 0x08, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x66, 0x00, 0x6f, 0x00,
+  0x6f, 0x00, 0x2e, 0x00, 0x65, 0x00, 0x78, 0x00, 0x65, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00
+};
+
+static bool jobgetinfo_out_check(struct torture_context *tctx, 
+                                                               struct atsvc_JobGetInfo *r)
+{
+       torture_assert(tctx, *r->out.job_info != NULL, "job info");
+       torture_assert_int_equal(tctx, (*r->out.job_info)->job_time, 84600000, "time");
+       torture_assert_int_equal(tctx, (*r->out.job_info)->days_of_month, 0, "days of month");
+       torture_assert_int_equal(tctx, (*r->out.job_info)->days_of_week, 0x2, "days of week");
+       torture_assert_int_equal(tctx, (*r->out.job_info)->flags, 0x13, "flags");
+       torture_assert_str_equal(tctx, (*r->out.job_info)->command, "foo.exe", "command");
+       return true;
+}
+
+struct torture_suite *ndr_atsvc_suite(TALLOC_CTX *ctx)
+{
+       struct torture_suite *suite = torture_suite_create(ctx, "atsvc");
+
+       torture_suite_add_ndr_pull_fn_test(suite, atsvc_JobEnum, jobenum_in_data, NDR_IN, jobenum_in_check );
+       /* torture_suite_add_ndr_pull_fn_test(suite, atsvc_JobEnum, jobenum_out_data, NDR_IN, jobenum_out_check ); */
+
+       torture_suite_add_ndr_pull_fn_test(suite, atsvc_JobAdd, jobadd_in_data, NDR_IN, jobadd_in_check );
+       /* torture_suite_add_ndr_pull_fn_test(suite, atsvc_JobAdd, jobadd_out_data, NDR_IN, jobadd_out_check ); */
+
+       torture_suite_add_ndr_pull_fn_test(suite, atsvc_JobDel, jobdel_in_data, NDR_IN, jobdel_in_check );
+       /* torture_suite_add_ndr_pull_fn_test(suite, atsvc_JobDel, jobdel_out_data, NDR_IN, jobdel_out_check ); */
+
+       torture_suite_add_ndr_pull_fn_test(suite, atsvc_JobGetInfo, jobgetinfo_in_data, NDR_IN, jobgetinfo_in_check );
+       /* torture_suite_add_ndr_pull_fn_test(suite, atsvc_JobGetInfo, jobgetinfo_out_data, NDR_IN, jobgetinfo_out_check ); */
+
+       return suite;
+}
+

diff --git a/source4/torture/ndr/ndr.c b/source4/torture/ndr/ndr.c
index c1179395c1170dc8c77d148f8e4976726d08cd93..2fc31f09e65280855c68fc07aa52f629a4376a64 100644 (file)
--- a/source4/torture/ndr/ndr.c
+++ b/source4/torture/ndr/ndr.c
@@ -86,6 +86,7 @@ NTSTATUS torture_ndr_init(void)
        struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "NDR");
 
        torture_suite_add_suite(suite, ndr_winreg_suite(suite));
+       torture_suite_add_suite(suite, ndr_atsvc_suite(suite));
 
        torture_register_suite(suite);
 

diff --git a/source4/torture/ndr/winreg.c b/source4/torture/ndr/winreg.c
index 30f2dccf5f6504fd86b27511ac527f31ff7291c6..8259a0a45e94b298c5671088ea87a219510338c2 100644 (file)
--- a/source4/torture/ndr/winreg.c
+++ b/source4/torture/ndr/winreg.c
@@ -473,6 +473,45 @@ static bool getkeysecurity_out_check(struct torture_context *tctx, struct winreg
        return true;
 }
 
+static const uint8_t enumkey_in_data[] = {
+  0x00, 0x00, 0x00, 0x00, 0x85, 0xb8, 0x41, 0xb0, 0x17, 0xe4, 0x28, 0x45,
+  0x8a, 0x69, 0xbf, 0x40, 0x79, 0x82, 0x8b, 0xcb, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x14, 0x04, 0x01, 0x00, 0x00, 0x00, 0x0a, 0x02, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
+  0xff, 0xff, 0xff, 0x7f, 0xff, 0xff, 0xff, 0x7f
+};
+
+static bool enumkey_in_check(struct torture_context *tctx, struct winreg_EnumKey *r)
+{
+       torture_assert_int_equal(tctx, r->in.enum_index, 0, "enum index");
+       torture_assert_int_equal(tctx, r->in.name->size, 1044, "name size");
+       torture_assert_int_equal(tctx, r->in.name->length, 0, "name len");
+       torture_assert(tctx, r->in.keyclass != NULL, "keyclass pointer");
+       torture_assert(tctx, r->in.keyclass->name == NULL, "keyclass");
+       torture_assert(tctx, r->in.last_changed_time != NULL, "last_changed_time != NULL");
+       return true;
+}
+
+static const uint8_t enumkey_out_data[] = {
+  0x08, 0x00, 0x14, 0x04, 0x18, 0xe8, 0x07, 0x00, 0x0a, 0x02, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x53, 0x00, 0x41, 0x00,
+  0x4d, 0x00, 0x00, 0x00, 0xd0, 0x62, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xdc, 0x62, 0x07, 0x00, 0x50, 0x67, 0xd0, 0x8b,
+  0x16, 0x06, 0xc2, 0x01, 0x00, 0x00, 0x00, 0x00
+};
+
+static bool enumkey_out_check(struct torture_context *tctx, struct winreg_EnumKey *r)
+{
+       torture_assert_int_equal(tctx, r->out.name->size, 1044, "name size");
+       torture_assert_int_equal(tctx, r->out.name->length, 8, "name len");
+       torture_assert(tctx, r->out.keyclass != NULL, "keyclass pointer");
+       torture_assert(tctx, r->out.keyclass->name == NULL, "keyclass");
+       torture_assert(tctx, r->out.last_changed_time != NULL, "last_changed_time pointer");
+       /* FIXME: *last_changed_time */
+       return true;
+}
+
 struct torture_suite *ndr_winreg_suite(TALLOC_CTX *ctx)
 {
        struct torture_suite *suite = torture_suite_create(ctx, "winreg");
@@ -516,6 +555,9 @@ struct torture_suite *ndr_winreg_suite(TALLOC_CTX *ctx)
        /*torture_suite_add_ndr_pull_fn_test(suite, winreg_GetKeySecurity, getkeysecurity_in_data, NDR_IN, getkeysecurity_in_check );
        torture_suite_add_ndr_pull_fn_test(suite, winreg_GetKeySecurity, getkeysecurity_out_data, NDR_OUT, getkeysecurity_out_check );*/
 
+       torture_suite_add_ndr_pull_fn_test(suite, winreg_EnumKey, enumkey_in_data, NDR_IN, enumkey_in_check );
+       torture_suite_add_ndr_pull_fn_test(suite, winreg_EnumKey, enumkey_out_data, NDR_OUT, enumkey_out_check );
+
        return suite;
 }