r19507: Merge my DSO fixes branch. Building Samba's libraries as shared libraries

[sfrench/samba-autobuild/.git] / source4 / torture / ldap / common.c

diff --git a/source4/torture/ldap/common.c b/source4/torture/ldap/common.c
index f5b2a1254d7e4cc9a68a6cc3b43710e3e0fbe84b..071f0faa2da9e75e5fb6b8530c60ce9a04116a0d 100644 (file)
--- a/source4/torture/ldap/common.c
+++ b/source4/torture/ldap/common.c
@@ -22,9 +22,9 @@
 */
 
 #include "includes.h"
-#include "asn_1.h"
 #include "libcli/ldap/ldap.h"
-#include "auth/gensec/gensec.h"
+#include "torture/torture.h"
+#include "torture/ldap/proto.h"
 
 NTSTATUS torture_ldap_bind(struct ldap_connection *conn, const char *userdn, const char *password)
 {
@@ -39,7 +39,7 @@ NTSTATUS torture_ldap_bind(struct ldap_connection *conn, const char *userdn, con
        return status;
 }
 
-NTSTATUS torture_ldap_bind_sasl(struct ldap_connection *conn, 
+_PUBLIC_ NTSTATUS torture_ldap_bind_sasl(struct ldap_connection *conn, 
                                struct cli_credentials *creds)
 {
         NTSTATUS status;
@@ -54,7 +54,7 @@ NTSTATUS torture_ldap_bind_sasl(struct ldap_connection *conn,
 }
 
 /* open a ldap connection to a server */
-NTSTATUS torture_ldap_connection(TALLOC_CTX *mem_ctx, struct ldap_connection **conn, 
+_PUBLIC_ NTSTATUS torture_ldap_connection(TALLOC_CTX *mem_ctx, struct ldap_connection **conn, 
                                const char *url)
 {
        NTSTATUS status;
@@ -64,7 +64,7 @@ NTSTATUS torture_ldap_connection(TALLOC_CTX *mem_ctx, struct ldap_connection **c
                return NT_STATUS_INVALID_PARAMETER;
        }
 
-       *conn = ldap_new_connection(mem_ctx, NULL);
+       *conn = ldap4_new_connection(mem_ctx, NULL);
 
        status = ldap_connect(*conn, url);
        if (!NT_STATUS_IS_OK(status)) {
@@ -98,3 +98,22 @@ NTSTATUS torture_ldap_close(struct ldap_connection *conn)
        talloc_free(conn);
        return NT_STATUS_OK;
 }
+
+NTSTATUS torture_ldap_init(void)
+{
+       struct torture_suite *suite = torture_suite_create(
+                                                                               talloc_autofree_context(),
+                                                                               "LDAP");
+       torture_suite_add_simple_test(suite, "BENCH-CLDAP", 
+                                                                 torture_bench_cldap);
+       torture_suite_add_simple_test(suite, "BASIC", torture_ldap_basic);
+       torture_suite_add_simple_test(suite, "CLDAP", torture_cldap);
+       torture_suite_add_simple_test(suite, "SCHEMA", torture_ldap_schema);
+
+       suite->description = talloc_strdup(
+                                                       suite, "LDAP and CLDAP tests");
+
+       torture_register_suite(suite);
+
+       return NT_STATUS_OK;
+}