summaryrefslogtreecommitdiff
path: root/source4/torture/ldap
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-12-08 23:32:43 +0100
committerStefan Metzmacher <metze@samba.org>2007-12-21 05:48:57 +0100
commita72c5053c587f0ed6113ef514fe3739cb81e7abf (patch)
tree6099f21bea03a584363c76c6b87a0f648f35d44e /source4/torture/ldap
parentdd7e5ed88c48f4ee39e53be07c8839791e914e45 (diff)
downloadsamba-a72c5053c587f0ed6113ef514fe3739cb81e7abf.tar.gz
samba-a72c5053c587f0ed6113ef514fe3739cb81e7abf.tar.bz2
samba-a72c5053c587f0ed6113ef514fe3739cb81e7abf.zip
r26353: Remove use of global_loadparm.
(This used to be commit 17637e4490e42db6cdef619286c4d5a0982e9d1a)
Diffstat (limited to 'source4/torture/ldap')
-rw-r--r--source4/torture/ldap/basic.c4
-rw-r--r--source4/torture/ldap/common.c5
2 files changed, 6 insertions, 3 deletions
diff --git a/source4/torture/ldap/basic.c b/source4/torture/ldap/basic.c
index 3f030c97ba..76d412a7cd 100644
--- a/source4/torture/ldap/basic.c
+++ b/source4/torture/ldap/basic.c
@@ -27,6 +27,8 @@
#include "torture/torture.h"
#include "torture/ldap/proto.h"
+#include "param/param.h"
+
static bool test_bind_simple(struct ldap_connection *conn, const char *userdn, const char *password)
{
NTSTATUS status;
@@ -47,7 +49,7 @@ static bool test_bind_sasl(struct ldap_connection *conn, struct cli_credentials
printf("Testing sasl bind as user\n");
- status = torture_ldap_bind_sasl(conn, creds);
+ status = torture_ldap_bind_sasl(conn, creds, global_loadparm);
if (!NT_STATUS_IS_OK(status)) {
ret = false;
}
diff --git a/source4/torture/ldap/common.c b/source4/torture/ldap/common.c
index 66b2bb1e56..b03a6d8113 100644
--- a/source4/torture/ldap/common.c
+++ b/source4/torture/ldap/common.c
@@ -39,11 +39,12 @@ NTSTATUS torture_ldap_bind(struct ldap_connection *conn, const char *userdn, con
}
_PUBLIC_ NTSTATUS torture_ldap_bind_sasl(struct ldap_connection *conn,
- struct cli_credentials *creds)
+ struct cli_credentials *creds,
+ struct loadparm_context *lp_ctx)
{
NTSTATUS status;
- status = ldap_bind_sasl(conn, creds);
+ status = ldap_bind_sasl(conn, creds, lp_ctx);
if (!NT_STATUS_IS_OK(status)) {
printf("Failed sasl bind with provided credentials - %s\n",
nt_errstr(status));