mir/isc-dhcp
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-09-01 06:45:27 +00:00
Code Issues Releases Wiki Activity

[master] Correctly handled v6 lease file entries that do not match to a pool

Browse Source 
Merged in rt39314.
This commit is contained in:
Thomas Markwalder
2015-06-26 15:52:46 -04:00
parent 68b3e7f25d
commit ff1b3d041a
2 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
server/confpars.c
View File

@@ -4955,9 +4955,10 @@ parse_ia_na_declaration(struct parse *cfile) {
&iaaddr->addr) != ISC_R_SUCCESS) {
inet_ntop(AF_INET6, &iaaddr->addr,
addr_buf, sizeof(addr_buf));
parse_warn(cfile, "no pool found for address %s",
addr_buf);
return;
log_error("No pool found for IA_NA address %s",
addr_buf);
iasubopt_dereference(&iaaddr, MDL);
continue;
}
/* remove old information */
@@ -5406,9 +5407,10 @@ parse_ia_ta_declaration(struct parse *cfile) {
&iaaddr->addr) != ISC_R_SUCCESS) {
inet_ntop(AF_INET6, &iaaddr->addr,
addr_buf, sizeof(addr_buf));
parse_warn(cfile, "no pool found for address %s",
addr_buf);
return;
log_error("No pool found for IA_TA address %s",
addr_buf);
iasubopt_dereference(&iaaddr, MDL);
continue;
}
/* remove old information */
@@ -5858,9 +5860,9 @@ parse_ia_pd_declaration(struct parse *cfile) {
&iapref->addr) != ISC_R_SUCCESS) {
inet_ntop(AF_INET6, &iapref->addr,
addr_buf, sizeof(addr_buf));
parse_warn(cfile, "no pool found for address %s",
addr_buf);
return;
log_error("No pool found for prefix %s", addr_buf);
iasubopt_dereference(&iapref, MDL);
continue;
}
/* remove old information */