>From 6ba9c5b6463da8a7338cbff067bb6625a8b9bc45 Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik Date: Wed, 13 Mar 2013 11:09:11 +0100 Subject: [PATCH] Making the ldb check configurable It is possible to enable/disable checking in LDB memberof plugin whether it was built against the same version of LDB that is present on the system. This feature is turned off by default and enabled in Fedora/RHEL spec file. --- src/external/libldb.m4 | 16 ++++++++++++++++ src/ldb_modules/memberof.c | 4 +++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/external/libldb.m4 b/src/external/libldb.m4 index d3d3ccecec303d17102cedccfaba0db70329002d..4d1a8aa2f86867aae5514660374eab708ec28cf6 100644 --- a/src/external/libldb.m4 +++ b/src/external/libldb.m4 @@ -24,5 +24,21 @@ else ldblibdir="${libdir}/ldb" fi fi + +AC_MSG_CHECKING([feature ldb runtime version check]) +AC_ARG_ENABLE(ldb-version-check, + [AS_HELP_STRING([--enable-ldb-version-check], + [compile with ldb runtime version check ] + [@<:@default=no@:>@])], + enable_ldb_version_check="$enableval", + enable_ldb_version_check="no") +if test x"$enable_ldb_version_check" = xyes ; then + AC_MSG_RESULT([yes]) + AC_DEFINE([LDB_VERSION_CHECK], [1], + [Define to 1 if you want ldb version check.]) +else + AC_MSG_RESULT([no]) +fi + AC_MSG_NOTICE([ldb lib directory: $ldblibdir]) AC_SUBST(ldblibdir) diff --git a/src/ldb_modules/memberof.c b/src/ldb_modules/memberof.c index f7eeb4070748d4a4f517c44520f9a501dd48a245..1e2edf5f69298c253f6b606a4caa4c2ebc8f5e33 100644 --- a/src/ldb_modules/memberof.c +++ b/src/ldb_modules/memberof.c @@ -4566,8 +4566,10 @@ const struct ldb_module_ops ldb_memberof_module_ops = { int ldb_init_module(const char *version) { +#ifdef LDB_VERSION_CHECK #ifdef LDB_MODULE_CHECK_VERSION LDB_MODULE_CHECK_VERSION(version); -#endif +#endif /* LDB_MODULE_CHECK_VERSION */ +#endif /* LDB_VERSION_CHECK */ return ldb_register_module(&ldb_memberof_module_ops); } -- 1.8.1.4