diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-10 04:33:16 +0100 |
---|---|---|
committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:49:01 +0100 |
commit | b65dba2245bf382c47d65c95ac9b1efa43918fc0 (patch) | |
tree | e2a474ba5bd99368423ad11d3632c55a51ed865c /source4/torture/ldap/basic.c | |
parent | 4a36b71675a5ea2a22d7cf2a79d61a3cd511e99f (diff) | |
download | samba-b65dba2245bf382c47d65c95ac9b1efa43918fc0.tar.gz samba-b65dba2245bf382c47d65c95ac9b1efa43918fc0.tar.xz samba-b65dba2245bf382c47d65c95ac9b1efa43918fc0.zip |
r26355: Eliminate global_loadparm in more places.
(This used to be commit 5d589a0d94bd76a9b4c9fc748854e8098ea43c4d)
Diffstat (limited to 'source4/torture/ldap/basic.c')
-rw-r--r-- | source4/torture/ldap/basic.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source4/torture/ldap/basic.c b/source4/torture/ldap/basic.c index 76d412a7cd8..358bf535905 100644 --- a/source4/torture/ldap/basic.c +++ b/source4/torture/ldap/basic.c @@ -42,14 +42,15 @@ static bool test_bind_simple(struct ldap_connection *conn, const char *userdn, c return ret; } -static bool test_bind_sasl(struct ldap_connection *conn, struct cli_credentials *creds) +static bool test_bind_sasl(struct torture_context *tctx, + struct ldap_connection *conn, struct cli_credentials *creds) { NTSTATUS status; bool ret = true; printf("Testing sasl bind as user\n"); - status = torture_ldap_bind_sasl(conn, creds, global_loadparm); + status = torture_ldap_bind_sasl(conn, creds, tctx->lp_ctx); if (!NT_STATUS_IS_OK(status)) { ret = false; } @@ -205,7 +206,7 @@ bool torture_ldap_basic(struct torture_context *torture) url = talloc_asprintf(mem_ctx, "ldap://%s/", host); - status = torture_ldap_connection(mem_ctx, &conn, url); + status = torture_ldap_connection(torture, &conn, url); if (!NT_STATUS_IS_OK(status)) { return false; } @@ -220,7 +221,7 @@ bool torture_ldap_basic(struct torture_context *torture) ret = false; } - if (!test_bind_sasl(conn, cmdline_credentials)) { + if (!test_bind_sasl(torture, conn, cmdline_credentials)) { ret = false; } |