diff options
| -rw-r--r-- | source4/lib/ldb/common/ldb.c | 2 | ||||
| -rw-r--r-- | source4/lib/ldb/common/ldb_modules.c | 10 | ||||
| -rw-r--r-- | source4/lib/ldb/include/ldb_private.h | 4 | ||||
| -rw-r--r-- | source4/lib/ldb/ldb_ldap/ldb_ldap.c | 6 | ||||
| -rw-r--r-- | source4/lib/ldb/tests/sample_module.c | 2 | ||||
| -rwxr-xr-x | source4/lib/ldb/tests/test-soloading.sh | 2 |
6 files changed, 13 insertions, 13 deletions
diff --git a/source4/lib/ldb/common/ldb.c b/source4/lib/ldb/common/ldb.c index 3c9ef3ff69..b51c288993 100644 --- 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 7da7b9ba34..34e0afbf93 100644 --- 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 d2dcc675a5..0ffba9d99b 100644 --- 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 3f6ff3fd5b..a4534c549a 100644 --- 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 98d8e865dd..1a9e72c907 100644 --- 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 c42c9b22ba..da6d57541e 100755 --- 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 |