Hello,

this patch removes old work-around for a bug in dns_db_unregister(). This bug was fixed in BIND version 9.7.0a1.

Oldest available BIND version for RHEL 6.2 contains required fix already.
(version bind-9.7.0-5.P2, build Wed, 26 May 2010 04:55:42 EDT, https://brewweb.devel.redhat.com/buildinfo?buildID=133161)

Patch also adds note to README and bumps dependency version in SPEC file.

Petr^2 Spacek
>From d09edb2d88fb730043c7d1f11b979ea8bc260e37 Mon Sep 17 00:00:00 2001
From: Petr Spacek <pspa...@redhat.com>
Date: Fri, 13 Apr 2012 12:20:42 +0200
Subject: [PATCH] Removed old work-around for a bug in dns_db_unregister().
 Signed-off-by: Petr Spacek <pspa...@redhat.com>

---
 README                       |    2 ++
 contrib/bind-dyndb-ldap.spec |    4 ++--
 src/ldap_driver.c            |    5 -----
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/README b/README
index aedb88c..08badc5 100644
--- a/README
+++ b/README
@@ -10,6 +10,8 @@ for your version here:
 
 Hopefully, the patch will once be included in the official BIND release.
 
+Because of bug in dns_db_unregister() in older BIND versions, BIND >= 9.7.0a1
+is required.
 
 2. Features
 ===========
diff --git a/contrib/bind-dyndb-ldap.spec b/contrib/bind-dyndb-ldap.spec
index 2d107a7..300d9d8 100644
--- a/contrib/bind-dyndb-ldap.spec
+++ b/contrib/bind-dyndb-ldap.spec
@@ -15,11 +15,11 @@ URL:            https://fedorahosted.org/bind-dyndb-ldap
 Source0:        https://fedorahosted.org/released/%{name}/%{name}-%{VERSION}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  bind-devel >= 32:9.6.1-0.3.b1
+BuildRequires:  bind-devel >= 32:9.7.0-0.7.b2.el6
 BuildRequires:  krb5-devel
 BuildRequires:  openldap-devel
 
-Requires:       bind >= 32:9.6.1-0.3.b1
+Requires:       bind >= 32:9.7.0-0.7.b2.el6
 
 %description
 This package provides an LDAP back-end plug-in for BIND. It features
diff --git a/src/ldap_driver.c b/src/ldap_driver.c
index af65de5..a87db18 100644
--- a/src/ldap_driver.c
+++ b/src/ldap_driver.c
@@ -1337,11 +1337,6 @@ dynamic_driver_destroy(void)
 	/* Only unregister the implementation if it was registered by us. */
 	if (ldapdb_imp != NULL)
 		dns_db_unregister(&ldapdb_imp);
-	/*
-	 * XXX: This is a work-around a bug in dns_db_unregister().
-	 *      Remove this line after it has been fixed.
-	 */
-	ldapdb_imp = NULL;
 
 	destroy_manager();
 }
-- 
1.7.7.6

_______________________________________________
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel

Reply via email to