mir/isc-dhcp
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-08-30 22:05:23 +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

8
RELNOTES
View File

@@ -140,6 +140,14 @@ by Eric Young (eay@cryptsoft.com).
for the bug report. for the bug report.
[ISC-Bugs #38639] [ISC-Bugs #38639]
- Corrected an issue in v6 lease file parsing. Prior to this, when encountering
a lease with an address for which no configured pool exists, the server was
declaring the lease file corrupt and incorrectly skipping over the subsequent
entry in the file. The server will now emit a log message indicating that
no pool was found for the address (or prefix) and correctly resume parsing
with the next entry in the lease file.
[ISC-Bugs #39314]
Changes since 4.3.2rc2 Changes since 4.3.2rc2
- None - None

20
server/confpars.c
View File

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