ldb: fix the standalone build

metze
(This used to be commit 91b49365abed6f67e2b3c18b0090b4e6ff1df935)

diff --git a/source4/lib/ldb/common/ldb.c b/source4/lib/ldb/common/ldb.c
index 3c9ef3ff6939f8095952e48766318be9bb52500c..b51c28899382f2914444fc60746e1dcef62c3695 100644 (file)
--- a/source4/lib/ldb/common/ldb.c
+++ b/source4/lib/ldb/common/ldb.c
@@ -65,7 +65,7 @@ static struct backends_list_entry {
 
 #ifdef HAVE_LDB_LDAP
 #define LDAP_INIT &ldb_ldap_backend_ops, \
-                                 &ldb_ildap_backend_ops, \
+                                 &ldb_ldapi_backend_ops, \
                                  &ldb_ldaps_backend_ops,
 #else
 #define LDAP_INIT

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index 7da7b9ba34d073534947978d749d45cbe8817a9d..34e0afbf935f55651a02b62f9d449dfcc41406c9 100644 (file)
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -129,11 +129,11 @@ static struct ops_list_entry {
 #ifndef STATIC_LIBLDB_MODULES
 
 #define STATIC_LIBLDB_MODULES \
-       ldb_operational_module_ops,     \
-       ldb_rdn_name_module_ops,        \
-       ldb_paged_results_module_ops,   \
-       ldb_sort_module_ops,            \
-       ldb_asq_module_ops, \
+       &ldb_operational_module_ops,    \
+       &ldb_rdn_name_module_ops,       \
+       &ldb_paged_results_module_ops,  \
+       &ldb_server_sort_module_ops,    \
+       &ldb_asq_module_ops, \
        NULL
 #endif
 

diff --git a/source4/lib/ldb/include/ldb_private.h b/source4/lib/ldb/include/ldb_private.h
index d2dcc675a58a6b380992c2f3ab26feef7feabe86..0ffba9d99baa8bcf324cfbf015b23302864198b5 100644 (file)
--- a/source4/lib/ldb/include/ldb_private.h
+++ b/source4/lib/ldb/include/ldb_private.h
@@ -185,7 +185,7 @@ extern const struct ldb_module_ops ldb_paged_results_module_ops;
 extern const struct ldb_module_ops ldb_rdn_name_module_ops;
 extern const struct ldb_module_ops ldb_schema_module_ops;
 extern const struct ldb_module_ops ldb_asq_module_ops;
-extern const struct ldb_module_ops ldb_sort_module_ops;
+extern const struct ldb_module_ops ldb_server_sort_module_ops;
 extern const struct ldb_module_ops ldb_ldap_module_ops;
 extern const struct ldb_module_ops ldb_ildap_module_ops;
 extern const struct ldb_module_ops ldb_tdb_module_ops;
@@ -194,7 +194,7 @@ extern const struct ldb_module_ops ldb_sqlite3_module_ops;
 extern const struct ldb_backend_ops ldb_tdb_backend_ops;
 extern const struct ldb_backend_ops ldb_sqlite3_backend_ops;
 extern const struct ldb_backend_ops ldb_ldap_backend_ops;
-extern const struct ldb_backend_ops ldb_ildap_backend_ops;
+extern const struct ldb_backend_ops ldb_ldapi_backend_ops;
 extern const struct ldb_backend_ops ldb_ldaps_backend_ops;
 
 int ldb_match_msg(struct ldb_context *ldb,

diff --git a/source4/lib/ldb/ldb_ldap/ldb_ldap.c b/source4/lib/ldb/ldb_ldap/ldb_ldap.c
index 3f6ff3fd5b8edadec611adb65f8119e6d0a674c3..a4534c549ad93a7fd9d70245c521dde7af1ce4bd 100644 (file)
--- a/source4/lib/ldb/ldb_ldap/ldb_ldap.c
+++ b/source4/lib/ldb/ldb_ldap/ldb_ldap.c
@@ -826,17 +826,17 @@ failed:
        return -1;
 }
 
-_PUBLIC_ struct ldb_backend_ops ldb_ldap_backend_ops = {
+const struct ldb_backend_ops ldb_ldap_backend_ops = {
        .name = "ldap",
        .connect_fn = lldb_connect
 };
 
-_PUBLIC_ struct ldb_backend_ops ldb_ldapi_backend_ops = {
+const struct ldb_backend_ops ldb_ldapi_backend_ops = {
        .name = "ldapi",
        .connect_fn = lldb_connect
 };
 
-_PUBLIC_ struct ldb_backend_ops ldb_ldaps_backend_ops = {
+const struct ldb_backend_ops ldb_ldaps_backend_ops = {
        .name = "ldaps",
        .connect_fn = lldb_connect
 };

diff --git a/source4/lib/ldb/tests/sample_module.c b/source4/lib/ldb/tests/sample_module.c
index 98d8e865dd07813eb0d3b6c4be194a710d023c63..1a9e72c907b23976a7cac2aa8de6bc5075012b06 100644 (file)
--- a/source4/lib/ldb/tests/sample_module.c
+++ b/source4/lib/ldb/tests/sample_module.c
@@ -32,7 +32,7 @@ int sample_add(struct ldb_module *mod, struct ldb_request *req)
        return ldb_next_request(mod, req);
 }
 
-_PUBLIC_ const struct ldb_module_ops ldb_sample_module_ops = {
+const struct ldb_module_ops ldb_sample_module_ops = {
        .name              = "sample",
        .add               = sample_add,
 };

diff --git a/source4/lib/ldb/tests/test-soloading.sh b/source4/lib/ldb/tests/test-soloading.sh
index c42c9b22bae9f4f598735849d7831eb79755a79c..da6d57541e59fe42cf585dc3100509624762e9f5 100755 (executable)
--- a/source4/lib/ldb/tests/test-soloading.sh
+++ b/source4/lib/ldb/tests/test-soloading.sh
@@ -19,7 +19,7 @@ fi
 
 cat <<EOF | $VALGRIND ldbadd || exit 1
 dn: @MODULES
-@LIST: sample_module
+@LIST: sample
 EOF
 
 cat <<EOF | $VALGRIND ldbadd || exit 1