r25000: Fix some more C++ compatibility warnings.

(This used to be commit 08bb1ef643ab906f1645cf6f32763dc73b1884e4)

2 files changed, 11 insertions, 8 deletions

diff --git a/source4/torture/nbt/dgram.c b/source4/torture/nbt/dgram.c
index 2effe25ab7..ee97242de5 100644
--- a/source4/torture/nbt/dgram.c
+++ b/source4/torture/nbt/dgram.c
@@ -42,7 +42,7 @@ static void netlogon_handler(struct dgram_mailslot_handler *dgmslot,
 {
 	NTSTATUS status;
 	struct nbt_netlogon_packet netlogon;
-	int *replies = dgmslot->private;
+	int *replies = (int *)dgmslot->private;
 
 	printf("netlogon reply from %s:%d\n", src->addr, src->port);
 
@@ -227,7 +227,7 @@ static void ntlogon_handler(struct dgram_mailslot_handler *dgmslot,
 {
 	NTSTATUS status;
 	struct nbt_ntlogon_packet ntlogon;
-	int *replies = dgmslot->private;
+	int *replies = (int *)dgmslot->private;
 
 	printf("ntlogon reply from %s:%d\n", src->addr, src->port);
 
diff --git a/source4/torture/nbt/winsreplication.c b/source4/torture/nbt/winsreplication.c
index 78f6352ed6..0d9e758647 100644
--- a/source4/torture/nbt/winsreplication.c
+++ b/source4/torture/nbt/winsreplication.c
@@ -220,7 +220,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;
 
@@ -537,8 +537,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;
@@ -9450,7 +9450,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);
@@ -9546,7 +9547,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);
@@ -9597,7 +9599,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;