From b65dba2245bf382c47d65c95ac9b1efa43918fc0 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 10 Dec 2007 04:33:16 +0100 Subject: r26355: Eliminate global_loadparm in more places. (This used to be commit 5d589a0d94bd76a9b4c9fc748854e8098ea43c4d) --- source4/torture/ldap/common.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'source4/torture/ldap/common.c') diff --git a/source4/torture/ldap/common.c b/source4/torture/ldap/common.c index b03a6d8113..11b11dcc00 100644 --- a/source4/torture/ldap/common.c +++ b/source4/torture/ldap/common.c @@ -54,8 +54,9 @@ _PUBLIC_ NTSTATUS torture_ldap_bind_sasl(struct ldap_connection *conn, } /* open a ldap connection to a server */ -_PUBLIC_ NTSTATUS torture_ldap_connection(TALLOC_CTX *mem_ctx, struct ldap_connection **conn, - const char *url) +_PUBLIC_ NTSTATUS torture_ldap_connection(struct torture_context *tctx, + struct ldap_connection **conn, + const char *url) { NTSTATUS status; @@ -64,7 +65,7 @@ _PUBLIC_ NTSTATUS torture_ldap_connection(TALLOC_CTX *mem_ctx, struct ldap_conne return NT_STATUS_INVALID_PARAMETER; } - *conn = ldap4_new_connection(mem_ctx, NULL); + *conn = ldap4_new_connection(tctx, tctx->lp_ctx, NULL); status = ldap_connect(*conn, url); if (!NT_STATUS_IS_OK(status)) { @@ -76,17 +77,17 @@ _PUBLIC_ NTSTATUS torture_ldap_connection(TALLOC_CTX *mem_ctx, struct ldap_conne } /* open a ldap connection to a server */ -NTSTATUS torture_ldap_connection2(TALLOC_CTX *mem_ctx, struct ldap_connection **conn, +NTSTATUS torture_ldap_connection2(struct torture_context *tctx, struct ldap_connection **conn, const char *url, const char *userdn, const char *password) { NTSTATUS status; - status = torture_ldap_connection(mem_ctx, conn, url); + status = torture_ldap_connection(tctx, conn, url); NT_STATUS_NOT_OK_RETURN(status); status = ldap_bind_simple(*conn, userdn, password); if (!NT_STATUS_IS_OK(status)) { - printf("Failed a simple ldap bind - %s\n", ldap_errstr(*conn, mem_ctx, status)); + printf("Failed a simple ldap bind - %s\n", ldap_errstr(*conn, tctx, status)); } return status; -- cgit