r25035: Fix some more warnings, use service pointer rather than service number in more places.

(This used to be commit df9cebcb97e20564359097148665bd519f31bc6f)

4 files changed, 9 insertions, 9 deletions

diff --git a/source4/torture/libnet/libnet_BecomeDC.c b/source4/torture/libnet/libnet_BecomeDC.c
index 9d67e093b1..9e870d9f26 100644
--- a/source4/torture/libnet/libnet_BecomeDC.c
+++ b/source4/torture/libnet/libnet_BecomeDC.c
@@ -442,7 +442,7 @@ static NTSTATUS test_apply_schema(struct test_become_dc_state *s,
 		return werror_to_ntstatus(status);
 	}
 
-	if (lp_parm_bool(-1, "become dc", "dump objects", False)) {
+	if (lp_parm_bool(NULL, "become dc", "dump objects", false)) {
 		for (i=0; i < objs->num_objects; i++) {
 			struct ldb_ldif ldif;
 			fprintf(stdout, "#\n");
@@ -670,7 +670,7 @@ static NTSTATUS test_become_dc_store_chunk(void *private_data,
 		return werror_to_ntstatus(status);
 	}
 
-	if (lp_parm_bool(-1, "become dc", "dump objects", False)) {
+	if (lp_parm_bool(NULL, "become dc", "dump objects", false)) {
 		for (i=0; i < objs->num_objects; i++) {
 			struct ldb_ldif ldif;
 			fprintf(stdout, "#\n");
@@ -700,7 +700,7 @@ static NTSTATUS test_become_dc_store_chunk(void *private_data,
 			return NT_STATUS_FOOBAR;
 		}
 
-		if (lp_parm_bool(-1, "become dc", "dump objects", False)) {
+		if (lp_parm_bool(NULL, "become dc", "dump objects", false)) {
 			DEBUG(0,("# %s\n", sa->lDAPDisplayName));
 			NDR_PRINT_DEBUG(drsuapi_DsReplicaLinkedAttribute, &linked_attributes[i]);
 			dump_data(0,
@@ -726,7 +726,7 @@ BOOL torture_net_become_dc(struct torture_context *torture)
 	s = talloc_zero(torture, struct test_become_dc_state);
 	if (!s) return False;
 
-	s->netbios_name = lp_parm_string(-1, "become dc", "smbtorture dc");
+	s->netbios_name = lp_parm_string(NULL, "become dc", "smbtorture dc");
 	if (!s->netbios_name || !s->netbios_name[0]) {
 		s->netbios_name = "smbtorturedc";
 	}
@@ -834,7 +834,7 @@ BOOL torture_net_become_dc(struct torture_context *torture)
 		goto cleanup;
 	}
 
-	if (lp_parm_bool(-1, "become dc", "do not unjoin", false)) {
+	if (lp_parm_bool(NULL, "become dc", "do not unjoin", false)) {
 		talloc_free(s);
 		return ret;
 	}
diff --git a/source4/torture/libnet/libnet_user.c b/source4/torture/libnet/libnet_user.c
index 186bd98aa5..a642d4bf52 100644
--- a/source4/torture/libnet/libnet_user.c
+++ b/source4/torture/libnet/libnet_user.c
@@ -418,7 +418,7 @@ static void set_test_changes(TALLOC_CTX *mem_ctx, struct libnet_ModifyUser *r,
 		case acct_expiry:
 			continue_if_field_set(r->in.acct_expiry);
 			now = timeval_add(&now, (random() % (31*24*60*60)), 0);
-			r->in.acct_expiry = talloc_memdup(mem_ctx, &now, sizeof(now));
+			r->in.acct_expiry = (struct timeval *)talloc_memdup(mem_ctx, &now, sizeof(now));
 			fldname = "acct_expiry";
 			break;
 
diff --git a/source4/torture/libnet/userinfo.c b/source4/torture/libnet/userinfo.c
index 95975e630e..314bc6d4da 100644
--- a/source4/torture/libnet/userinfo.c
+++ b/source4/torture/libnet/userinfo.c
@@ -300,7 +300,7 @@ static BOOL test_userinfo_async(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 }
 
 
-BOOL torture_userinfo(struct torture_context *torture)
+bool torture_userinfo(struct torture_context *torture)
 {
 	NTSTATUS status;
 	struct dcerpc_pipe *p;
diff --git a/source4/torture/libnet/userman.c b/source4/torture/libnet/userman.c
index deebfd9014..51e0016ea0 100644
--- a/source4/torture/libnet/userman.c
+++ b/source4/torture/libnet/userman.c
@@ -357,7 +357,7 @@ static BOOL test_usermod(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 		case acct_expiry:
 			continue_if_field_set(mod->in.change.acct_expiry);
 			now = timeval_add(&now, (random() % (31*24*60*60)), 0);
-			mod->in.change.acct_expiry = talloc_memdup(mem_ctx, &now, sizeof(now));
+			mod->in.change.acct_expiry = (struct timeval *)talloc_memdup(mem_ctx, &now, sizeof(now));
 			mod->in.change.fields |= USERMOD_FIELD_ACCT_EXPIRY;
 			fldname = "acct_expiry";
 			break;
@@ -533,7 +533,7 @@ done:
 }
 
 
-BOOL torture_userdel(struct torture_context *torture)
+bool torture_userdel(struct torture_context *torture)
 {
 	NTSTATUS status;
 	struct dcerpc_pipe *p;