s4-ldb: enable ldb module version checking

diff --git a/source4/lib/ldb/ldb_ldap/ldb_ldap.c b/source4/lib/ldb/ldb_ldap/ldb_ldap.c
index b32be90a89f88361f0b81d81c9c4716324fe42fc..672826928665ab89628e8c18e7d672a090a2a487 100644 (file)
--- a/source4/lib/ldb/ldb_ldap/ldb_ldap.c
+++ b/source4/lib/ldb/ldb_ldap/ldb_ldap.c
@@ -957,10 +957,11 @@ failed:
 /*
   initialise the module
  */
-int ldb_ldap_init(const char *ldb_version)
+int ldb_ldap_init(const char *version)
 {
        int ret, i;
        const char *names[] = { "ldap", "ldaps", "ldapi", NULL };
+       LDB_MODULE_CHECK_VERSION(version);
        for (i=0; names[i]; i++) {
                ret = ldb_register_backend(names[i], lldb_connect, false);
                if (ret != LDB_SUCCESS) {

diff --git a/source4/lib/ldb/ldb_sqlite3/ldb_sqlite3.c b/source4/lib/ldb/ldb_sqlite3/ldb_sqlite3.c
index 3aa6672964f5050b92cb43948ead23192b002f11..26f0351d08052662591fc6c0c95f1fa44b8e6757 100644 (file)
--- a/source4/lib/ldb/ldb_sqlite3/ldb_sqlite3.c
+++ b/source4/lib/ldb/ldb_sqlite3/ldb_sqlite3.c
@@ -1932,7 +1932,8 @@ failed:
        return LDB_ERR_OPERATIONS_ERROR;
 }
 
-const struct ldb_backend_ops ldb_sqlite3_backend_ops = {
-       .name = "sqlite3",
-       .connect_fn = lsqlite3_connect
-};
+int ldb_sqlite3_init(const char *version)
+{
+       LDB_MODULE_CHECK_VERSION(version);
+       return ldb_register_backend("sqlite3", lsqlite3_connect, false);
+}

diff --git a/source4/lib/ldb/ldb_tdb/ldb_tdb.c b/source4/lib/ldb/ldb_tdb/ldb_tdb.c
index 4a96af3ab8d58e5cdd6a7ba889fc6dd5db194f35..d9547c98c4645f3d0e2a9696f6e43ed711988def 100644 (file)
--- a/source4/lib/ldb/ldb_tdb/ldb_tdb.c
+++ b/source4/lib/ldb/ldb_tdb/ldb_tdb.c
@@ -1449,5 +1449,6 @@ static int ltdb_connect(struct ldb_context *ldb, const char *url,
 
 int ldb_tdb_init(const char *version)
 {
+       LDB_MODULE_CHECK_VERSION(version);
        return ldb_register_backend("tdb", ltdb_connect, false);
 }

diff --git a/source4/lib/ldb/modules/asq.c b/source4/lib/ldb/modules/asq.c
index 45a733bd13c4b4f416fb58966ee6018cd81e86a3..ebfafb9556eaf991a7336eca145913cbe046081f 100644 (file)
--- a/source4/lib/ldb/modules/asq.c
+++ b/source4/lib/ldb/modules/asq.c
@@ -32,6 +32,7 @@
  *  Author: Simo Sorce
  */
 
+#include "ldb_includes.h"
 #include "ldb_module.h"
 
 struct asq_context {
@@ -406,7 +407,8 @@ static const struct ldb_module_ops ldb_asq_module_ops = {
        .init_context      = asq_init
 };
 
-int ldb_asq_init(const char *ldb_version)
+int ldb_asq_init(const char *version)
 {
+       LDB_MODULE_CHECK_VERSION(version);
        return ldb_register_module(&ldb_asq_module_ops);
 }

diff --git a/source4/lib/ldb/modules/paged_results.c b/source4/lib/ldb/modules/paged_results.c
index f61dd9698d4e29f4cbb3f1c9a363911697bee5db..5e1601c087d80a29b7991d717b391e656992905e 100644 (file)
--- a/source4/lib/ldb/modules/paged_results.c
+++ b/source4/lib/ldb/modules/paged_results.c
@@ -431,5 +431,6 @@ static const struct ldb_module_ops ldb_paged_results_module_ops = {
 
 int ldb_paged_results_init(const char *version)
 {
+       LDB_MODULE_CHECK_VERSION(version);
        return ldb_register_module(&ldb_paged_results_module_ops);
 }

diff --git a/source4/lib/ldb/modules/paged_searches.c b/source4/lib/ldb/modules/paged_searches.c
index 3d86b8d3caca827faa08e9bc1ac11926bf5274fb..d4d7814d73f3eb1e8b6bf9ebda0d4c7b82c1f9b4 100644 (file)
--- a/source4/lib/ldb/modules/paged_searches.c
+++ b/source4/lib/ldb/modules/paged_searches.c
@@ -379,5 +379,6 @@ static const struct ldb_module_ops ldb_paged_searches_module_ops = {
 
 int ldb_paged_searches_init(const char *version)
 {
+       LDB_MODULE_CHECK_VERSION(version);
        return ldb_register_module(&ldb_paged_searches_module_ops);
 }

diff --git a/source4/lib/ldb/modules/rdn_name.c b/source4/lib/ldb/modules/rdn_name.c
index caff9f59e27511013ebab398c0bfcfd7fa28e944..e27eea50bf505de36ee47e797a98d0b116aa7967 100644 (file)
--- a/source4/lib/ldb/modules/rdn_name.c
+++ b/source4/lib/ldb/modules/rdn_name.c
@@ -386,5 +386,6 @@ static const struct ldb_module_ops ldb_rdn_name_module_ops = {
 
 int ldb_rdn_name_init(const char *version)
 {
+       LDB_MODULE_CHECK_VERSION(version);
        return ldb_register_module(&ldb_rdn_name_module_ops);
 }

diff --git a/source4/lib/ldb/modules/skel.c b/source4/lib/ldb/modules/skel.c
index 5dee735c60f3e492db957987b5b12da31d567bb0..e04436f760691d046b046c8295f01d05a788c075 100644 (file)
--- a/source4/lib/ldb/modules/skel.c
+++ b/source4/lib/ldb/modules/skel.c
@@ -31,6 +31,7 @@
  *  Author: Simo Sorce
  */
 
+#include "ldb_includes.h"
 #include "ldb_module.h"
 
 struct private_data {
@@ -139,5 +140,6 @@ static const struct ldb_module_ops ldb_skel_module_ops = {
 
 int ldb_skel_init(const char *version)
 {
+       LDB_MODULE_CHECK_VERSION(version);
        return ldb_register_module(&ldb_skel_module_ops);
 }

diff --git a/source4/lib/ldb/modules/sort.c b/source4/lib/ldb/modules/sort.c
index fd30c90505606af05d8c044f8b32ef5bc9fcee0e..0ecba1c714ce08df1c0f38ad5c3d239a24de0e5e 100644 (file)
--- a/source4/lib/ldb/modules/sort.c
+++ b/source4/lib/ldb/modules/sort.c
@@ -31,6 +31,7 @@
  *  Author: Simo Sorce
  */
 
+#include "ldb_includes.h"
 #include "ldb_module.h"
 
 struct opaque {
@@ -352,5 +353,6 @@ static const struct ldb_module_ops ldb_server_sort_module_ops = {
 
 int ldb_server_sort_init(const char *version)
 {
+       LDB_MODULE_CHECK_VERSION(version);
        return ldb_register_module(&ldb_server_sort_module_ops);
 }

diff --git a/source4/lib/ldb/tests/sample_module.c b/source4/lib/ldb/tests/sample_module.c
index d93c6de4407a08cdf77286d3b728e2843b55d89e..8862325c3b4835f3622885c4380bdeaef9bfd1db 100644 (file)
--- a/source4/lib/ldb/tests/sample_module.c
+++ b/source4/lib/ldb/tests/sample_module.c
@@ -21,6 +21,7 @@
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
 
+#include "ldb_includes.h"
 #include "ldb_module.h"
 
 int sample_add(struct ldb_module *mod, struct ldb_request *req)
@@ -63,5 +64,6 @@ static struct ldb_module_ops ldb_sample_module_ops = {
 
 int ldb_sample_init(const char *version)
 {
+       LDB_MODULE_CHECK_VERSION(version);
        return ldb_register_module(&ldb_sample_module_ops);
 }