|
 |
67cff45 |
diff --git a/server/confpars.c b/server/confpars.c
|
|
|
67cff45 |
index 12ab0e6..4454be9 100644
|
|
|
67cff45 |
--- a/server/confpars.c
|
|
|
67cff45 |
+++ b/server/confpars.c
|
|
|
67cff45 |
@@ -3756,6 +3756,19 @@ add_ipv6_pool_to_subnet(struct subnet *subnet, u_int16_t type,
|
|
|
67cff45 |
share->ipv6_pools[num_pools+1] = NULL;
|
|
|
67cff45 |
}
|
|
|
67cff45 |
|
|
|
67cff45 |
+static void
|
|
|
67cff45 |
+check_addr_in_subnet(struct subnet *subnet, struct iaddr *addr) {
|
|
|
67cff45 |
+ char lowbuf [INET6_ADDRSTRLEN], netbuf [INET6_ADDRSTRLEN];
|
|
|
67cff45 |
+
|
|
|
67cff45 |
+ if (!addr_eq(subnet->net, subnet_number(*addr, subnet->netmask))) {
|
|
|
077cc76 |
+ strncpy(lowbuf, piaddr(*addr), INET6_ADDRSTRLEN);
|
|
|
077cc76 |
+ strncpy(netbuf, piaddr(subnet->net), INET6_ADDRSTRLEN);
|
|
|
67cff45 |
+ log_fatal("bad range6, address %s not in subnet6 %s/%d",
|
|
|
67cff45 |
+ lowbuf, netbuf, subnet->prefix_len);
|
|
|
67cff45 |
+ }
|
|
|
67cff45 |
+
|
|
|
67cff45 |
+}
|
|
|
67cff45 |
+
|
|
|
67cff45 |
/* address-range6-declaration :== ip-address6 ip-address6 SEMI
|
|
|
67cff45 |
| ip-address6 SLASH number SEMI
|
|
|
67cff45 |
| ip-address6 [SLASH number] TEMPORARY SEMI */
|
|
|
67cff45 |
@@ -3788,6 +3801,8 @@ parse_address_range6(struct parse *cfile, struct group *group) {
|
|
|
67cff45 |
return;
|
|
|
67cff45 |
}
|
|
|
67cff45 |
|
|
|
67cff45 |
+ check_addr_in_subnet(group->subnet, &lo);
|
|
|
67cff45 |
+
|
|
|
67cff45 |
/*
|
|
|
67cff45 |
* See if we we're using range or CIDR notation or TEMPORARY
|
|
|
67cff45 |
*/
|
|
|
67cff45 |
@@ -3855,6 +3870,8 @@ parse_address_range6(struct parse *cfile, struct group *group) {
|
|
|
67cff45 |
return;
|
|
|
67cff45 |
}
|
|
|
67cff45 |
|
|
|
67cff45 |
+ check_addr_in_subnet(group->subnet, &hi;;
|
|
|
67cff45 |
+
|
|
|
67cff45 |
/*
|
|
|
67cff45 |
* Convert our range to a set of CIDR networks.
|
|
|
67cff45 |
*/
|