Commit 93d3a6fd authored by Michael Graff's avatar Michael Graff
Browse files

Don't say we're actually expiring addresses unless we really do.

parent f942258b
......@@ -593,8 +593,10 @@ check_expire_namehooks(dns_adbname_t *name, isc_stdtime_t now)
* Check to see if we need to remove the v4 addresses
*/
if (!NAME_FETCH_V4(name) && EXPIRE_OK(name->expire_v4, now)) {
DP(DEF_LEVEL, "expiring v4 for name %p", name);
clean_namehooks(adb, &name->v4);
if (HAVE_INET(name)) {
DP(DEF_LEVEL, "expiring v4 for name %p", name);
clean_namehooks(adb, &name->v4);
}
name->expire_v4 = INT_MAX;
name->partial_result &= ~DNS_ADBFIND_INET;
}
......@@ -603,8 +605,10 @@ check_expire_namehooks(dns_adbname_t *name, isc_stdtime_t now)
* Check to see if we need to remove the v6 addresses
*/
if (!NAME_FETCH_V6(name) && EXPIRE_OK(name->expire_v6, now)) {
DP(DEF_LEVEL, "expiring v6 for name %p", name);
clean_namehooks(adb, &name->v6);
if (HAVE_INET6(name)) {
DP(DEF_LEVEL, "expiring v6 for name %p", name);
clean_namehooks(adb, &name->v6);
}
name->expire_v6 = INT_MAX;
name->partial_result &= ~DNS_ADBFIND_INET6;
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment