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

(This used to be commit b28860978fe29c5b10abfb8c59d7182864e21dd6)

4 files changed, 6 insertions, 6 deletions

diff --git a/source4/torture/ldap/basic.c b/source4/torture/ldap/basic.c
index 7b041e9255..ba7130677c 100644
--- a/source4/torture/ldap/basic.c
+++ b/source4/torture/ldap/basic.c
@@ -194,9 +194,9 @@ BOOL torture_ldap_basic(struct torture_context *torture)
         struct ldap_connection *conn;
 	TALLOC_CTX *mem_ctx;
 	BOOL ret = True;
-	const char *host = lp_parm_string(-1, "torture", "host");
-	const char *userdn = lp_parm_string(-1, "torture", "ldap_userdn");
-	const char *secret = lp_parm_string(-1, "torture", "ldap_secret");
+	const char *host = torture_setting_string(torture, "host", NULL);
+	const char *userdn = torture_setting_string(torture, "ldap_userdn", NULL);
+	const char *secret = torture_setting_string(torture, "ldap_secret", NULL);
 	char *url;
 	char *basedn;
 
diff --git a/source4/torture/ldap/cldap.c b/source4/torture/ldap/cldap.c
index 45d758547d..321feb639f 100644
--- a/source4/torture/ldap/cldap.c
+++ b/source4/torture/ldap/cldap.c
@@ -256,7 +256,7 @@ BOOL torture_cldap(struct torture_context *torture)
 {
 	TALLOC_CTX *mem_ctx;
 	BOOL ret = True;
-	const char *host = lp_parm_string(-1, "torture", "host");
+	const char *host = torture_setting_string(torture, "host", NULL);
 
 	mem_ctx = talloc_init("torture_cldap");
 
diff --git a/source4/torture/ldap/cldapbench.c b/source4/torture/ldap/cldapbench.c
index c49e4eb687..99ab69cee4 100644
--- a/source4/torture/ldap/cldapbench.c
+++ b/source4/torture/ldap/cldapbench.c
@@ -110,7 +110,7 @@ BOOL torture_bench_cldap(struct torture_context *torture)
 	NTSTATUS status;
 	BOOL ret = True;
 	
-	make_nbt_name_server(&name, lp_parm_string(-1, "torture", "host"));
+	make_nbt_name_server(&name, torture_setting_string(torture, "host", NULL));
 
 	/* do an initial name resolution to find its IP */
 	status = resolve_name(&name, mem_ctx, &address, event_context_find(mem_ctx));
diff --git a/source4/torture/ldap/schema.c b/source4/torture/ldap/schema.c
index df5f8ca5ce..bc8f1e38ce 100644
--- a/source4/torture/ldap/schema.c
+++ b/source4/torture/ldap/schema.c
@@ -487,7 +487,7 @@ BOOL torture_ldap_schema(struct torture_context *torture)
 	struct ldb_context *ldb;
 	TALLOC_CTX *mem_ctx;
 	BOOL ret = True;
-	const char *host = lp_parm_string(-1, "torture", "host");
+	const char *host = torture_setting_string(torture, "host", NULL);
 	char *url;
 	struct test_rootDSE rootDSE;
 	struct dsdb_schema *schema = NULL;