1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
|
--- 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");
|
