r25026: Move param/param.h out of includes.h

[abartlet/samba.git/.git] / source4 / torture / nbt / winsreplication.c

diff --git a/source4/torture/nbt/winsreplication.c b/source4/torture/nbt/winsreplication.c
index bc370c8b4eafb3fd1486a1688f6aa838e9dbe2a8..c829b36e8e517eb9a85a0dc3d056ec84c7d58642 100644 (file)
--- a/source4/torture/nbt/winsreplication.c
+++ b/source4/torture/nbt/winsreplication.c
@@ -30,6 +30,7 @@
 #include "librpc/gen_ndr/ndr_nbt.h"
 #include "torture/torture.h"
 #include "torture/nbt/proto.h"
+#include "param/param.h"
 
 #define CHECK_STATUS(tctx, status, correct) \
        torture_assert_ntstatus_equal(tctx, status, correct, \
@@ -97,10 +98,6 @@ static bool test_assoc_ctx1(struct torture_context *tctx)
        struct nbt_name name;
        const char *address;
 
-       if (!torture_setting_bool(tctx, "dangerous", false)) {
-               torture_skip(tctx, "winsrepl: cross connection assoc_ctx usage disabled - enable dangerous tests to use");
-       }
-
        if (!torture_nbt_get_name(tctx, &name, &address))
                return false;
 
@@ -224,7 +221,7 @@ static bool test_assoc_ctx2(struct torture_context *tctx)
 /*
   display a replication entry
 */
-static void display_entry(TALLOC_CTX *tctx, struct wrepl_name *name)
+static void display_entry(struct torture_context *tctx, struct wrepl_name *name)
 {
        int i;
 
@@ -541,8 +538,8 @@ static const struct wrepl_ip addresses_X_3_4[] = {
        }
 };
 
-static struct test_wrepl_conflict_conn *test_create_conflict_ctx(TALLOC_CTX *tctx,
-                                                                const char *address)
+static struct test_wrepl_conflict_conn *test_create_conflict_ctx(
+               struct torture_context *tctx, const char *address)
 {
        struct test_wrepl_conflict_conn *ctx;
        struct wrepl_associate associate;
@@ -9454,7 +9451,8 @@ static void test_conflict_owned_active_vs_replica_handler_query(struct nbt_name_
 {
        struct nbt_name *name;
        struct nbt_name_packet *rep_packet;
-       struct test_conflict_owned_active_vs_replica_struct *rec = nbtsock->incoming.private;
+       struct test_conflict_owned_active_vs_replica_struct *rec = 
+               (struct test_conflict_owned_active_vs_replica_struct *)nbtsock->incoming.private;
 
        _NBT_ASSERT(req_packet->qdcount, 1);
        _NBT_ASSERT(req_packet->questions[0].question_type, NBT_QTYPE_NETBIOS);
@@ -9550,7 +9548,8 @@ static void test_conflict_owned_active_vs_replica_handler_release(
 {
        struct nbt_name *name;
        struct nbt_name_packet *rep_packet;
-       struct test_conflict_owned_active_vs_replica_struct *rec = nbtsock->incoming.private;
+       struct test_conflict_owned_active_vs_replica_struct *rec = 
+               (struct test_conflict_owned_active_vs_replica_struct *)nbtsock->incoming.private;
 
        _NBT_ASSERT(req_packet->qdcount, 1);
        _NBT_ASSERT(req_packet->questions[0].question_type, NBT_QTYPE_NETBIOS);
@@ -9601,7 +9600,8 @@ static void test_conflict_owned_active_vs_replica_handler(struct nbt_name_socket
                                                          struct nbt_name_packet *req_packet, 
                                                          struct socket_address *src)
 {
-       struct test_conflict_owned_active_vs_replica_struct *rec = nbtsock->incoming.private;
+       struct test_conflict_owned_active_vs_replica_struct *rec = 
+               (struct test_conflict_owned_active_vs_replica_struct *)nbtsock->incoming.private;
 
        rec->defend.ret = false;
 
@@ -9670,13 +9670,15 @@ static bool torture_nbt_winsreplication_owned(struct torture_context *tctx)
 /*
   test simple WINS replication operations
 */
-struct torture_suite *torture_nbt_winsreplication(void)
+struct torture_suite *torture_nbt_winsreplication(TALLOC_CTX *mem_ctx)
 {
        struct torture_suite *suite = torture_suite_create(
-               talloc_autofree_context(),
-               "WINSREPLICATION");
-       torture_suite_add_simple_test(suite, "assoc_ctx1", 
-                                     test_assoc_ctx1);
+               mem_ctx, "WINSREPLICATION");
+       struct torture_tcase *tcase;
+
+       tcase = torture_suite_add_simple_test(suite, "assoc_ctx1", 
+                                            test_assoc_ctx1);
+       tcase->tests->dangerous = true;
 
        torture_suite_add_simple_test(suite, "assoc_ctx2", 
                                      test_assoc_ctx2);