r19392: Use torture_setting_* rather than lp_parm_* where possible.

(This used to be commit b28860978fe29c5b10abfb8c59d7182864e21dd6)

8 files changed, 25 insertions, 25 deletions

diff --git a/source4/torture/libnet/domain.c b/source4/torture/libnet/domain.c
index 991fe8e51a..c85e6006fe 100644
--- a/source4/torture/libnet/domain.c
+++ b/source4/torture/libnet/domain.c
@@ -82,7 +82,7 @@ BOOL torture_domainopen(struct torture_context *torture)
 	struct lsa_String name;
 
 	mem_ctx = talloc_init("test_domain_open");
-	binding = lp_parm_string(-1, "torture", "binding");
+	binding = torture_setting_string(torture, "binding", NULL);
 
 	evt_ctx = event_context_find(torture);
 	net_ctx = libnet_context_init(evt_ctx);
diff --git a/source4/torture/libnet/libnet_domain.c b/source4/torture/libnet/libnet_domain.c
index 24431de54a..8bf175212e 100644
--- a/source4/torture/libnet/libnet_domain.c
+++ b/source4/torture/libnet/libnet_domain.c
@@ -133,7 +133,7 @@ BOOL torture_domain_open_lsa(struct torture_context *torture)
 	struct policy_handle h;
 	const char *bindstr;
 	
-	bindstr = lp_parm_string(-1, "torture", "binding");
+	bindstr = torture_setting_string(torture, "binding", NULL);
 	status = dcerpc_parse_binding(torture, bindstr, &binding);
 	if (!NT_STATUS_IS_OK(status)) {
 		d_printf("failed to parse binding string\n");
@@ -190,7 +190,7 @@ BOOL torture_domain_close_lsa(struct torture_context *torture)
 	struct dcerpc_pipe *p;
 	struct libnet_DomainClose r;
 
-	bindstr = lp_parm_string(-1, "torture", "binding");
+	bindstr = torture_setting_string(torture, "binding", NULL);
 	status = dcerpc_parse_binding(torture, bindstr, &binding);
 	if (!NT_STATUS_IS_OK(status)) {
 		d_printf("failed to parse binding string\n");
@@ -263,7 +263,7 @@ BOOL torture_domain_open_samr(struct torture_context *torture)
 	BOOL ret = True;
 
 	mem_ctx = talloc_init("test_domainopen_lsa");
-	binding = lp_parm_string(-1, "torture", "binding");
+	binding = torture_setting_string(torture, "binding", NULL);
 
 	ctx = libnet_context_init(evt_ctx);
 	ctx->cred = cmdline_credentials;
@@ -322,7 +322,7 @@ BOOL torture_domain_close_samr(struct torture_context *torture)
 	struct dcerpc_pipe *p;
 	struct libnet_DomainClose r;
 
-	bindstr = lp_parm_string(-1, "torture", "binding");
+	bindstr = torture_setting_string(torture, "binding", NULL);
 	status = dcerpc_parse_binding(torture, bindstr, &binding);
 	if (!NT_STATUS_IS_OK(status)) {
 		d_printf("failed to parse binding string\n");
diff --git a/source4/torture/libnet/libnet_lookup.c b/source4/torture/libnet/libnet_lookup.c
index eb03eb5eca..7a414b3297 100644
--- a/source4/torture/libnet/libnet_lookup.c
+++ b/source4/torture/libnet/libnet_lookup.c
@@ -43,9 +43,9 @@ BOOL torture_lookup(struct torture_context *torture)
 	ctx = libnet_context_init(NULL);
 	ctx->cred = cmdline_credentials;
 
-	lookup.in.hostname = lp_parm_string(-1, "torture", "host");
+	lookup.in.hostname = torture_setting_string(torture, "host", NULL);
 	if (lookup.in.hostname == NULL) {
-		bindstr = lp_parm_string(-1, "torture", "binding");
+		bindstr = torture_setting_string(torture, "binding", NULL);
 		status = dcerpc_parse_binding(mem_ctx, bindstr, &bind);
 		if (NT_STATUS_IS_OK(status)) {
 			lookup.in.hostname = bind->host;
@@ -89,9 +89,9 @@ BOOL torture_lookup_host(struct torture_context *torture)
 	ctx = libnet_context_init(NULL);
 	ctx->cred = cmdline_credentials;
 
-	lookup.in.hostname = lp_parm_string(-1, "torture", "host");
+	lookup.in.hostname = torture_setting_string(torture, "host", NULL);
 	if (lookup.in.hostname == NULL) {
-		bindstr = lp_parm_string(-1, "torture", "binding");
+		bindstr = torture_setting_string(torture, "binding", NULL);
 		status = dcerpc_parse_binding(mem_ctx, bindstr, &bind);
 		if (NT_STATUS_IS_OK(status)) {
 			lookup.in.hostname = bind->host;
diff --git a/source4/torture/libnet/libnet_rpc.c b/source4/torture/libnet/libnet_rpc.c
index 30c1438e38..19802df72d 100644
--- a/source4/torture/libnet/libnet_rpc.c
+++ b/source4/torture/libnet/libnet_rpc.c
@@ -139,7 +139,7 @@ BOOL torture_rpc_connect_srv(struct torture_context *torture)
 	struct dcerpc_binding *binding;
 	const char *bindstr;;
 
-	bindstr = lp_parm_string(-1, "torture", "binding");
+	bindstr = torture_setting_string(torture, "binding", NULL);
 	status = dcerpc_parse_binding(torture, bindstr, &binding);
 	if (!NT_STATUS_IS_OK(status)) {
 		d_printf("failed to parse binding string\n");
@@ -157,7 +157,7 @@ BOOL torture_rpc_connect_pdc(struct torture_context *torture)
 	struct dcerpc_binding *binding;
 	const char *bindstr;
 	
-	bindstr = lp_parm_string(-1, "torture", "binding");
+	bindstr = torture_setting_string(torture, "binding", NULL);
 	status = dcerpc_parse_binding(torture, bindstr, &binding);
 	if (!NT_STATUS_IS_OK(status)) {
 		d_printf("failed to parse binding string\n");
@@ -175,7 +175,7 @@ BOOL torture_rpc_connect_dc(struct torture_context *torture)
 	struct dcerpc_binding *binding;
 	const char *bindstr;
 	
-	bindstr = lp_parm_string(-1, "torture", "binding");
+	bindstr = torture_setting_string(torture, "binding", NULL);
 	status = dcerpc_parse_binding(torture, bindstr, &binding);
 	if (!NT_STATUS_IS_OK(status)) {
 		d_printf("failed to parse binding string\n");
@@ -193,7 +193,7 @@ BOOL torture_rpc_connect_dc_info(struct torture_context *torture)
 	struct dcerpc_binding *binding;
 	const char *bindstr;
 	
-	bindstr = lp_parm_string(-1, "torture", "binding");
+	bindstr = torture_setting_string(torture, "binding", NULL);
 	status = dcerpc_parse_binding(torture, bindstr, &binding);
 	if (!NT_STATUS_IS_OK(status)) {
 		d_printf("failed to parse binding string\n");
@@ -211,7 +211,7 @@ BOOL torture_rpc_connect_binding(struct torture_context *torture)
 	struct dcerpc_binding *binding;
 	const char *bindstr;
 	
-	bindstr = lp_parm_string(-1, "torture", "binding");
+	bindstr = torture_setting_string(torture, "binding", NULL);
 	status = dcerpc_parse_binding(torture, bindstr, &binding);
 	if (!NT_STATUS_IS_OK(status)) {
 		d_printf("failed to parse binding string\n");
diff --git a/source4/torture/libnet/libnet_share.c b/source4/torture/libnet/libnet_share.c
index 884c0b31c8..07505adebb 100644
--- a/source4/torture/libnet/libnet_share.c
+++ b/source4/torture/libnet/libnet_share.c
@@ -127,7 +127,7 @@ BOOL torture_listshares(struct torture_context *torture)
 	TALLOC_CTX *mem_ctx;
 
 	mem_ctx = talloc_init("test_listshares");
-	binding = lp_parm_string(-1, "torture", "binding");
+	binding = torture_setting_string(torture, "binding", NULL);
 	status = dcerpc_parse_binding(mem_ctx, binding, &bind);
 	if (!NT_STATUS_IS_OK(status)) {
 		printf("Error while parsing the binding string\n");
@@ -211,8 +211,8 @@ BOOL torture_delshare(struct torture_context *torture)
 	struct libnet_DelShare share;
 	
 	mem_ctx = talloc_init("test_listshares");
-	host = lp_parm_string(-1, "torture", "host");
-	binding = lp_parm_string(-1, "torture", "binding");
+	host = torture_setting_string(torture, "host", NULL);
+	binding = torture_setting_string(torture, "binding", NULL);
 	status = dcerpc_parse_binding(mem_ctx, binding, &bind);
 	if (!NT_STATUS_IS_OK(status)) {
 		printf("Error while parsing the binding string\n");
diff --git a/source4/torture/libnet/libnet_user.c b/source4/torture/libnet/libnet_user.c
index db8dfac6bd..606e0212e1 100644
--- a/source4/torture/libnet/libnet_user.c
+++ b/source4/torture/libnet/libnet_user.c
@@ -221,7 +221,7 @@ BOOL torture_createuser(struct torture_context *torture)
 	BOOL ret = True;
 
 	mem_ctx = talloc_init("test_createuser");
-	binding = lp_parm_string(-1, "torture", "binding");
+	binding = torture_setting_string(torture, "binding", NULL);
 
 	ctx = libnet_context_init(NULL);
 	ctx->cred = cmdline_credentials;
@@ -269,7 +269,7 @@ BOOL torture_deleteuser(struct torture_context *torture)
 	BOOL ret = True;
 
 	prep_mem_ctx = talloc_init("prepare test_deleteuser");
-	binding = lp_parm_string(-1, "torture", "binding");
+	binding = torture_setting_string(torture, "binding", NULL);
 
 	ctx = libnet_context_init(NULL);
 	ctx->cred = cmdline_credentials;
@@ -459,7 +459,7 @@ BOOL torture_modifyuser(struct torture_context *torture)
 	BOOL ret = True;
 
 	prep_mem_ctx = talloc_init("prepare test_deleteuser");
-	binding = lp_parm_string(-1, "torture", "binding");
+	binding = torture_setting_string(torture, "binding", NULL);
 
 	ctx = libnet_context_init(NULL);
 	ctx->cred = cmdline_credentials;
@@ -599,7 +599,7 @@ BOOL torture_userinfo_api(struct torture_context *torture)
 	struct libnet_UserInfo req;
 
 	prep_mem_ctx = talloc_init("prepare torture user info");
-	binding = lp_parm_string(-1, "torture", "binding");
+	binding = torture_setting_string(torture, "binding", NULL);
 
 	ctx = libnet_context_init(NULL);
 	ctx->cred = cmdline_credentials;
diff --git a/source4/torture/libnet/userinfo.c b/source4/torture/libnet/userinfo.c
index 4a92f9689f..f69f5b4cee 100644
--- a/source4/torture/libnet/userinfo.c
+++ b/source4/torture/libnet/userinfo.c
@@ -313,7 +313,7 @@ BOOL torture_userinfo(struct torture_context *torture)
 	uint32_t rid;
 
 	mem_ctx = talloc_init("test_userinfo");
-	binding = lp_parm_string(-1, "torture", "binding");
+	binding = torture_setting_string(torture, "binding", NULL);
 
 	status = torture_rpc_connection(mem_ctx, 
 					&p,
diff --git a/source4/torture/libnet/userman.c b/source4/torture/libnet/userman.c
index 3176b891bf..431443806d 100644
--- a/source4/torture/libnet/userman.c
+++ b/source4/torture/libnet/userman.c
@@ -488,7 +488,7 @@ BOOL torture_useradd(struct torture_context *torture)
 	BOOL ret = True;
 
 	mem_ctx = talloc_init("test_useradd");
-	binding = lp_parm_string(-1, "torture", "binding");
+	binding = torture_setting_string(torture, "binding", NULL);
 
 	status = torture_rpc_connection(mem_ctx, 
 					&p,
@@ -547,7 +547,7 @@ BOOL torture_userdel(struct torture_context *torture)
 	BOOL ret = True;
 
 	mem_ctx = talloc_init("test_userdel");
-	binding = lp_parm_string(-1, "torture", "binding");
+	binding = torture_setting_string(torture, "binding", NULL);
 
 	status = torture_rpc_connection(mem_ctx, 
 					&p,
@@ -592,7 +592,7 @@ BOOL torture_usermod(struct torture_context *torture)
 	BOOL ret = True;
 
 	mem_ctx = talloc_init("test_userdel");
-	binding = lp_parm_string(-1, "torture", "binding");
+	binding = torture_setting_string(torture, "binding", NULL);
 
 	status = torture_rpc_connection(mem_ctx, 
 					&p,