X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=dhcp%2Fpatches%2Fdhcp-4.2.4-P2-dupl-key.patch;fp=dhcp%2Fpatches%2Fdhcp-4.2.4-P2-dupl-key.patch;h=85c747331451671b21b9099183a1700895fe8d30;hb=177b938ab7c92b3ee6217161e4ab03609f98a6c1;hp=0000000000000000000000000000000000000000;hpb=c5fd0a55806e0a65a38f9e3a8e0a80aeda277cb5;p=people%2Fms%2Fipfire-3.x.git

diff --git a/dhcp/patches/dhcp-4.2.4-P2-dupl-key.patch b/dhcp/patches/dhcp-4.2.4-P2-dupl-key.patch
new file mode 100644
index 000000000..85c747331
--- /dev/null
+++ b/dhcp/patches/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);