From fc0930c9dfb732d3361aeaac8eacb9a06388d665 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Nov 15 2022 15:37:41 +0000
Subject: import bind-dyndb-ldap-11.9-8.el9_1


---

diff --git a/SOURCES/0001-Modify-empty-zone-conflicts-under-exclusive-mode_rhbz#2129844.patch b/SOURCES/0001-Modify-empty-zone-conflicts-under-exclusive-mode_rhbz#2129844.patch
new file mode 100644
index 0000000..bbcfe7d
--- /dev/null
+++ b/SOURCES/0001-Modify-empty-zone-conflicts-under-exclusive-mode_rhbz#2129844.patch
@@ -0,0 +1,35 @@
+From 7b4c1e28b3e64f7cd075599472e349510f8d33da Mon Sep 17 00:00:00 2001
+From: Petr Menšík <pemensik@redhat.com>
+Date: Sep 14 2022 15:23:20 +0000
+Subject: Modify empty zone conflicts under exclusive mode
+
+
+Does not accept new request when exclusive mode is active. Zone table
+can be modified even after main fwd entries have been added. Ensure
+empty zones handling keeps exclusive mode active.
+
+Exclusive mode were mentioned as the only protection it had by bind
+maintainer:
+https://gitlab.isc.org/isc-projects/bind9/-/merge_requests/6637#note_308928
+
+---
+
+diff --git a/src/fwd.c b/src/fwd.c
+index 24f6e53..0a3c673 100644
+--- a/src/fwd.c
++++ b/src/fwd.c
+@@ -595,10 +595,12 @@ fwd_configure_zone(const settings_set_t *set, ldap_instance_t *inst,
+ 		  dns_result_totext(result));
+ 
+ 	/* Handle collisions with automatic empty zones. */
+-	if (isconfigured == true)
++	if (isconfigured == true) {
++		run_exclusive_enter(inst, &lock_state);
+ 		CHECK(empty_zone_handle_conflicts(name,
+ 						  view->zonetable,
+ 						  (fwdpolicy == dns_fwdpolicy_first)));
++	}
+ 
+ cleanup:
+ 	run_exclusive_exit(inst, lock_state);
+
diff --git a/SPECS/bind-dyndb-ldap.spec b/SPECS/bind-dyndb-ldap.spec
index ec84dfc..e004bba 100644
--- a/SPECS/bind-dyndb-ldap.spec
+++ b/SPECS/bind-dyndb-ldap.spec
@@ -12,7 +12,7 @@
 
 Name:           bind-dyndb-ldap
 Version:        11.9
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        LDAP back-end plug-in for BIND
 
 License:        GPLv2+
@@ -21,6 +21,7 @@ Source0:        https://releases.pagure.org/%{name}/%{name}-%{VERSION}.tar.bz2
 Source1:        https://releases.pagure.org/%{name}/%{name}-%{VERSION}.tar.bz2.asc
 
 Patch1:         bind-dyndb-ldap-11.9-bind-9.16.17.patch
+Patch2:         0001-Modify-empty-zone-conflicts-under-exclusive-mode_rhbz#2129844.patch
 
 BuildRequires:  bind-devel >= %{bind_version}, bind-lite-devel >= %{bind_version}
 BuildRequires:  krb5-devel
@@ -116,6 +117,10 @@ sed -i.bak -e "$SEDSCRIPT" /etc/named.conf
 
 
 %changelog
+* Wed Oct 19 2022 Rafael Jeffman <rjeffman<redhat.com> - 11.9-8
+- Modify empty zone conflicts under exclusive mode
+  Resolves: rhbz#2129844, rhbz#2130614
+
 * Fri Nov 26 2021 Petr Menšík <pemensik@redhat.com> - 11.9-7
 - Rebuilt for BIND 9.16.23 (#2019575)