diff options
| author | Thomas Markwalder <tmark@isc.org> | 2015-06-26 15:52:46 -0400 |
|---|---|---|
| committer | Thomas Markwalder <tmark@isc.org> | 2015-06-26 15:52:46 -0400 |
| commit | ff1b3d041aa9ea7699fc69c3582d9a3352ea209c (patch) | |
| tree | 13166a5c902e0c5eaae98be6eca8ce6dbb8af411 /server/confpars.c | |
| parent | 68b3e7f25d2adba6589e21d8d4ed8698e8b80538 (diff) | |
| download | isc-dhcp-ff1b3d041aa9ea7699fc69c3582d9a3352ea209c.tar.gz | |
[master] Correctly handled v6 lease file entries that do not match to a pool
Merged in rt39314.
Diffstat (limited to 'server/confpars.c')
| -rw-r--r-- | server/confpars.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/server/confpars.c b/server/confpars.c index 415a38be..d5534549 100644 --- a/server/confpars.c +++ b/server/confpars.c @@ -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 */ |