Attachment #158816 for bug #201601

Lines 18-24 Link Here

(-)isc-dhcp42-server/Makefile (-1 / +1 lines)
18	USES= gmake	18	USES= gmake
19		19
20	PATCHLEVEL= P1	20	PATCHLEVEL= P1
21	PORTREVISION_SERVER= 0	21	PORTREVISION_SERVER= 1
22	PORTREVISION_CLIENT= 0	22	PORTREVISION_CLIENT= 0
23	PORTREVISION_RELAY= 0	23	PORTREVISION_RELAY= 0
24		24




--- server/confpars.c.orig	2015-02-27 13:42:45 UTC
+++ server/confpars.c
@@ -3926,28 +3926,10 @@ parse_prefix6(struct parse *cfile, struc
 		return;
 	}
 
-	/* Make sure starting prefix is within the subnet */
-	if (!addr_eq(group->subnet->net,
-		     subnet_number(lo, group->subnet->netmask))) {
-			      parse_warn(cfile, "prefix6 start prefix"
-                                                " is outside the subnet");
-			      skip_to_semi(cfile);
-		return;
-	}
-
 	if (!parse_ip6_addr(cfile, &hi)) {
 		return;
 	}
 
-	/* Make sure ending prefix is within the subnet */
-	if (!addr_eq(group->subnet->net,
-		     subnet_number(hi, group->subnet->netmask))) {
-			      parse_warn(cfile, "prefix6 end prefix"
-                                                " is outside the subnet");
-			      skip_to_semi(cfile);
-		return;
-	}
-
 	/*
 	 * Next is '/' number ';'.
 	 */
@@ -3970,11 +3952,6 @@ parse_prefix6(struct parse *cfile, struc
 		parse_warn(cfile, "networks have 0 to 128 bits (exclusive)");
 		return;
 	}
-	if (bits < group->subnet->prefix_len) {
-		parse_warn(cfile, "network mask smaller than subnet mask");
-		skip_to_semi(cfile);
-		return;
-	}
 	if (!is_cidr_mask_valid(&lo, bits) ||
 	    !is_cidr_mask_valid(&hi, bits)) {
 		parse_warn(cfile, "network mask too short");

Lines 18-24 Link Here

(-)isc-dhcp43-server/Makefile (-1 / +1 lines)
18	USES= gmake	18	USES= gmake
19		19
20	#PATCHLEVEL= P1	20	#PATCHLEVEL= P1
21	PORTREVISION_SERVER= 0	21	PORTREVISION_SERVER= 1
22	PORTREVISION_CLIENT= 0	22	PORTREVISION_CLIENT= 0
23	PORTREVISION_RELAY= 0	23	PORTREVISION_RELAY= 0
24		24




--- server/confpars.c.orig	2015-02-26 19:35:43 UTC
+++ server/confpars.c
@@ -4161,28 +4161,10 @@ parse_prefix6(struct parse *cfile,
 		return;
 	}
 
-	/* Make sure starting prefix is within the subnet */
-	if (!addr_eq(group->subnet->net,
-		     subnet_number(lo, group->subnet->netmask))) {
-			      parse_warn(cfile, "prefix6 start prefix"
-                                                " is outside the subnet");
-			      skip_to_semi(cfile);
-		return;
-	}
-
 	if (!parse_ip6_addr(cfile, &hi)) {
 		return;
 	}
 
-	/* Make sure ending prefix is within the subnet */
-	if (!addr_eq(group->subnet->net,
-		     subnet_number(hi, group->subnet->netmask))) {
-			      parse_warn(cfile, "prefix6 end prefix"
-                                                " is outside the subnet");
-			      skip_to_semi(cfile);
-		return;
-	}
-
 	/*
 	 * Next is '/' number ';'.
 	 */
@@ -4205,11 +4187,6 @@ parse_prefix6(struct parse *cfile,
 		parse_warn(cfile, "networks have 0 to 128 bits (exclusive)");
 		return;
 	}
-	if (bits < group->subnet->prefix_len) {
-		parse_warn(cfile, "network mask smaller than subnet mask");
-		skip_to_semi(cfile);
-		return;
-	}
 	if (!is_cidr_mask_valid(&lo, bits) ||
 	    !is_cidr_mask_valid(&hi, bits)) {
 		parse_warn(cfile, "network mask too short");

Return to bug 201601

Line 0 Link Here

(-)isc-dhcp42-server/files/patch-server_confpars.c (+43 lines)
	1	--- server/confpars.c.orig 2015-02-27 13:42:45 UTC
	2	+++ server/confpars.c
	3	@@ -3926,28 +3926,10 @@ parse_prefix6(struct parse *cfile, struc
	4	return;
	5	}
	6
	7	- /* Make sure starting prefix is within the subnet */
	8	- if (!addr_eq(group->subnet->net,
	9	- subnet_number(lo, group->subnet->netmask))) {
	10	- parse_warn(cfile, "prefix6 start prefix"
	11	- " is outside the subnet");
	12	- skip_to_semi(cfile);
	13	- return;
	14	- }
	15	-
	16	if (!parse_ip6_addr(cfile, &hi)) {
	17	return;
	18	}
	19
	20	- /* Make sure ending prefix is within the subnet */
	21	- if (!addr_eq(group->subnet->net,
	22	- subnet_number(hi, group->subnet->netmask))) {
	23	- parse_warn(cfile, "prefix6 end prefix"
	24	- " is outside the subnet");
	25	- skip_to_semi(cfile);
	26	- return;
	27	- }
	28	-
	29	/*
	30	* Next is '/' number ';'.
	31	*/
	32	@@ -3970,11 +3952,6 @@ parse_prefix6(struct parse *cfile, struc
	33	parse_warn(cfile, "networks have 0 to 128 bits (exclusive)");
	34	return;
	35	}
	36	- if (bits < group->subnet->prefix_len) {
	37	- parse_warn(cfile, "network mask smaller than subnet mask");
	38	- skip_to_semi(cfile);
	39	- return;
	40	- }
	41	if (!is_cidr_mask_valid(&lo, bits) \|\|
	42	!is_cidr_mask_valid(&hi, bits)) {
	43	parse_warn(cfile, "network mask too short");

Line 0 Link Here

(-)isc-dhcp43-server/files/patch-server_confpars.c (+43 lines)
	1	--- server/confpars.c.orig 2015-02-26 19:35:43 UTC
	2	+++ server/confpars.c
	3	@@ -4161,28 +4161,10 @@ parse_prefix6(struct parse *cfile,
	4	return;
	5	}
	6
	7	- /* Make sure starting prefix is within the subnet */
	8	- if (!addr_eq(group->subnet->net,
	9	- subnet_number(lo, group->subnet->netmask))) {
	10	- parse_warn(cfile, "prefix6 start prefix"
	11	- " is outside the subnet");
	12	- skip_to_semi(cfile);
	13	- return;
	14	- }
	15	-
	16	if (!parse_ip6_addr(cfile, &hi)) {
	17	return;
	18	}
	19
	20	- /* Make sure ending prefix is within the subnet */
	21	- if (!addr_eq(group->subnet->net,
	22	- subnet_number(hi, group->subnet->netmask))) {
	23	- parse_warn(cfile, "prefix6 end prefix"
	24	- " is outside the subnet");
	25	- skip_to_semi(cfile);
	26	- return;
	27	- }
	28	-
	29	/*
	30	* Next is '/' number ';'.
	31	*/
	32	@@ -4205,11 +4187,6 @@ parse_prefix6(struct parse *cfile,
	33	parse_warn(cfile, "networks have 0 to 128 bits (exclusive)");
	34	return;
	35	}
	36	- if (bits < group->subnet->prefix_len) {
	37	- parse_warn(cfile, "network mask smaller than subnet mask");
	38	- skip_to_semi(cfile);
	39	- return;
	40	- }
	41	if (!is_cidr_mask_valid(&lo, bits) \|\|
	42	!is_cidr_mask_valid(&hi, bits)) {
	43	parse_warn(cfile, "network mask too short");