[people/ms/ipfire-3.x.git] / dhcp / patches / dhcp-4.2.4-P2-dupl-key.patch

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);
Commit	Line	Data
177b938a MT	1	diff -up dhcp-4.2.4-P2/common/parse.c.dupl-key dhcp-4.2.4-P2/common/parse.c
	2	--- dhcp-4.2.4-P2/common/parse.c.dupl-key 2012-11-16 15:31:30.568561745 +0100
	3	+++ dhcp-4.2.4-P2/common/parse.c 2012-11-16 15:31:30.577561619 +0100
	4	@@ -2893,6 +2893,9 @@ int parse_zone (struct dns_zone *zone, s
	5	}
	6	val = key_name;
	7	}
	8	+ if (zone->key)
	9	+ log_fatal("Multiple key definition for zone %s.",
	10	+ zone->name);
	11	if (omapi_auth_key_lookup_name (&zone -> key, val) !=
	12	ISC_R_SUCCESS)
	13	parse_warn (cfile, "unknown key %s", val);