From b037bb18852ee7662432570f065e68dd8690dd10 Mon Sep 17 00:00:00 2001
From: Jiri Popelka <jpopelka@redhat.com>
Date: Nov 16 2012 14:32:06 +0000
Subject: multiple key statements in zone definition causes inappropriate error (#873794)


---

diff --git a/dhcp-4.2.4-P2-dupl-key.patch b/dhcp-4.2.4-P2-dupl-key.patch
new file mode 100644
index 0000000..85c7473
--- /dev/null
+++ b/dhcp-4.2.4-P2-dupl-key.patch
@@ -0,0 +1,13 @@
+diff -up dhcp-4.2.4-P2/common/parse.c.dupl-key dhcp-4.2.4-P2/common/parse.c
+--- dhcp-4.2.4-P2/common/parse.c.dupl-key	2012-11-16 15:31:30.568561745 +0100
++++ dhcp-4.2.4-P2/common/parse.c	2012-11-16 15:31:30.577561619 +0100
+@@ -2893,6 +2893,9 @@ int parse_zone (struct dns_zone *zone, s
+ 			    }
+ 			    val = key_name;
+ 		    }
++		    if (zone->key)
++			log_fatal("Multiple key definition for zone %s.",
++				  zone->name);
+ 		    if (omapi_auth_key_lookup_name (&zone -> key, val) !=
+ 			ISC_R_SUCCESS)
+ 			    parse_warn (cfile, "unknown key %s", val);
diff --git a/dhcp.spec b/dhcp.spec
index 996478f..4856a08 100644
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -18,7 +18,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  4.2.4
-Release:  20.%{patchver}%{?dist}
+Release:  21.%{patchver}%{?dist}
 # NEVER CHANGE THE EPOCH on this package.  The previous maintainer (prior to
 # dcantrell maintaining the package) made incorrect use of the epoch and
 # that's why it is at 12 now.  It should have never been used, but it was.
@@ -77,6 +77,7 @@ Patch42:  dhcp-4.2.4-failOverPeer.patch
 Patch43:  dhcp-4.2.4-P1-dhclient6-leases_semicolon_expected.patch
 Patch44:  dhcp-4.2.4-P1-interval.patch
 Patch45:  dhcp-4.2.4-P2-conflex-do-forward-updates.patch
+Patch46:  dhcp-4.2.4-P2-dupl-key.patch
 
 BuildRequires: autoconf
 BuildRequires: automake
@@ -324,7 +325,11 @@ rm -rf includes/isc-dhcp
 
 # do-forward-updates statement wasn't recognized (#863646)
 # (Submitted to dhcp-bugs@isc.org - [ISC-Bugs #31328])
-%patch45 -p1 -b .forward-updates.patch
+%patch45 -p1 -b .forward-updates
+
+# multiple key statements in zone definition causes inappropriate error (#873794)
+# (Submitted to dhcp-bugs@isc.org - [ISC-Bugs #31892])
+%patch46 -p1 -b .dupl-key
 
 pushd contrib
 %{__chmod} -x 3.0b1-lease-convert dhclient-tz-exithook.sh ldap/dhcpd-conf-to-ldap
@@ -558,6 +563,9 @@ fi
 
 
 %changelog
+* Fri Nov 16 2012 Jiri Popelka <jpopelka@redhat.com> - 12:4.2.4-21.P2
+- multiple key statements in zone definition causes inappropriate error (#873794)
+
 * Fri Oct 26 2012 Jiri Popelka <jpopelka@redhat.com> - 12:4.2.4-20.P2
 - fix path to dhcpd6.leases in dhcpd6.conf.sample (#870458)