[Pkg-openldap-devel] [openldap] 06/39: r1666 at pulsar: torsten | 2005-04-03 22:45:51 +0200 * Disabled the version check for Berkeley DB in upstream code. Any libdb4.2 package should work but of course using the latest will give you the best results (closes: #300851).

[Timo Aaltonen]

This is an automated email from the git hooks/post-receive script.

tjaalton-guest pushed a commit to annotated tag 2.2.23-2
in repository openldap.

commit 141a241dd8094ea75c620ac7e44fa7381c0f20fb
Author: Torsten Landschoff <torsten at debian.org>
Date:   Sun Apr 3 21:22:44 2005 +0000

     r1666 at pulsar:  torsten | 2005-04-03 22:45:51 +0200
      * Disabled the version check for Berkeley DB in upstream code. Any
        libdb4.2 package should work but of course using the latest will give
        you the best results (closes: #300851).
---
 debian/TODO                   |    2 --
 debian/changelog              |    3 +++
 servers/slapd/back-bdb/init.c |   10 ++++++++++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/debian/TODO b/debian/TODO
index 838b7c2..2156edb 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -2,8 +2,6 @@ openldap2.2 (2.2.23-2) unstable; urgency=low
 
   * Updated maintainer scripts to keep DB_CONFIG for LDAP databases over 
     upgrades (closes: #265860).
-  * Removed the version check for Berkeley DB from upstreams code. Otherwise
-    upgrading libdb4.2 will break slapd (closes: #300851).
   * debian/slapd.scripts-common: Store the diagnostic output from
     slapadd/slapcat and output it before aborting if the command failed.
   * debian/slapd.templates: Clean up the debconf templates of the slapd
diff --git a/debian/changelog b/debian/changelog
index b1ec3a9..f6148a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,9 @@ openldap2.2 (2.2.23-2) unstable; urgency=low
     fixing of LDIF data via the fix_ldif script. Only tried if an 
     initial slapadd using the original LDIF data fails. With this change
     upgrading from woody for some simple cases does work again.
+  * Disabled the version check for Berkeley DB in upstream code. Any 
+    libdb4.2 package should work but of course using the latest will give
+    you the best results (closes: #300851).
 
  -- 
 
diff --git a/servers/slapd/back-bdb/init.c b/servers/slapd/back-bdb/init.c
index ce4f630..02db223 100644
--- a/servers/slapd/back-bdb/init.c
+++ b/servers/slapd/back-bdb/init.c
@@ -601,6 +601,15 @@ bdb_initialize(
 
 	bi->bi_controls = controls;
 
+#ifdef STRICT_BDB_VERSION_CHECKING
+	/*
+	 * Disabled in the Debian build. Strictly speaking each BDB
+	 * version which has a binary compatible API should work. Of course
+	 * using the latest version is suggested but we don't force our 
+	 * users. Guess upstream wants to make sure that nobody reports
+	 * problems because he has the wrong BDB version installed.
+	 * -- Torsten Landschoff <torsten at debian.org>
+	 */
 	{	/* version check */
 		int major, minor, patch, ver;
 		char *version = db_version( &major, &minor, &patch );
@@ -629,6 +638,7 @@ bdb_initialize(
 		Debug( LDAP_DEBUG_ANY, LDAP_XSTRING(bdb_back_initialize)
 			": %s\n", version, 0, 0 );
 	}
+#endif
 
 	db_env_set_func_free( ber_memfree );
 	db_env_set_func_malloc( (db_malloc *)ber_memalloc );

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openldap/openldap.git