From 8408b3428d8c263f8453a0da8ef71e7fc1e4ec81 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Sat, 6 Nov 2004 20:15:39 +0000 Subject: r3583: - seperate the ldap client code and the ldap parsing code (vl: we should only sync the parsing code with trunk) - use hierachical talloc in the ldap client code metze (This used to be commit 1e9c0b68ca9ddb28877d45fc1b47653b13a7446d) --- source4/torture/ldap/common.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'source4/torture/ldap/common.c') diff --git a/source4/torture/ldap/common.c b/source4/torture/ldap/common.c index a0fe31d0e9..eea3b12073 100644 --- a/source4/torture/ldap/common.c +++ b/source4/torture/ldap/common.c @@ -67,25 +67,25 @@ NTSTATUS torture_ldap_bind_sasl(struct ldap_connection *conn, const char *userna } /* open a ldap connection to a server */ -NTSTATUS torture_ldap_connection(struct ldap_connection **conn, +NTSTATUS torture_ldap_connection(TALLOC_CTX *mem_ctx, struct ldap_connection **conn, const char *url, const char *userdn, const char *password) { NTSTATUS status = NT_STATUS_UNSUCCESSFUL; - BOOL ret; + int ret; if (!url) { printf("You must specify a url string\n"); return NT_STATUS_INVALID_PARAMETER; } - *conn = new_ldap_connection(); + *conn = ldap_connect(mem_ctx, url); if (!*conn) { printf("Failed to initialize ldap_connection structure\n"); return status; } - ret = ldap_setup_connection(*conn, url, userdn, password); - if (!ret) { + ret = ldap_bind_simple(*conn, userdn, password); + if (ret != LDAP_SUCCESS) { printf("Failed to connect with url [%s]\n", url); /* FIXME: what abut actually implementing an ldap_connection_free() function ? :-) sss */ -- cgit