diff --git a/lib/dns/adb.c b/lib/dns/adb.c index e8a20d9022..f18b751ff5 100644 --- a/lib/dns/adb.c +++ b/lib/dns/adb.c @@ -383,7 +383,7 @@ static isc_result_t dbfind_a6(dns_adbname_t *, isc_stdtime_t); #define FIND_HINTOK(fn) (((fn)->options & DNS_ADBFIND_HINTOK) != 0) #define FIND_GLUEOK(fn) (((fn)->options & DNS_ADBFIND_GLUEOK) != 0) #define FIND_HAS_ADDRS(fn) (!ISC_LIST_EMPTY((fn)->list)) -#define FIND_IGNORELAME(fn) (((fn)->options & DNS_ADBFIND_IGNORELAME) != 0) +#define FIND_RETURNLAME(fn) (((fn)->options & DNS_ADBFIND_RETURNLAME) != 0) /* * These are currently used on simple unsigned ints, so they are @@ -1858,7 +1858,7 @@ copy_namehook_lists(dns_adb_t *adb, dns_adbfind_t *find, dns_name_t *zone, while (namehook != NULL) { bucket = namehook->entry->lock_bucket; LOCK(&adb->entrylocks[bucket]); - if (!FIND_IGNORELAME(find) + if (!FIND_RETURNLAME(find) && entry_is_bad_for_zone(adb, namehook->entry, zone, now)) { find->options |= DNS_ADBFIND_LAMEPRUNED; diff --git a/lib/dns/include/dns/adb.h b/lib/dns/include/dns/adb.h index b17721bb6e..3f81d61ee5 100644 --- a/lib/dns/include/dns/adb.h +++ b/lib/dns/include/dns/adb.h @@ -156,8 +156,8 @@ struct dns_adbfind { * Glue or hints are ok. These are used when matching names already * in the adb, and when dns databases are searched. * - * _IGNORELAME: - * Ignore lame servers in a find, so that all addresses are returned. + * _RETURNLAME: + * Return lame servers in a find, so that all addresses are returned. * * _LAMEPRUNED: * At least one address was omitted from the list because it was lame. @@ -172,7 +172,7 @@ struct dns_adbfind { #define DNS_ADBFIND_STARTATROOT 0x00000020 #define DNS_ADBFIND_GLUEOK 0x00000040 #define DNS_ADBFIND_HINTOK 0x00000080 -#define DNS_ADBFIND_IGNORELAME 0x00000100 +#define DNS_ADBFIND_RETURNLAME 0x00000100 #define DNS_ADBFIND_LAMEPRUNED 0x00000200 /* dns_adbaddrinfo_t