upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-09 13:42:06 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'rename-shadowed-variable-v9_14' into 'v9_14'

Browse source 
rename-shadowed-variable

See merge request isc-projects/bind9!1699
This commit is contained in:
Mark Andrews 2019-03-14 21:35:49 -04:00
commit 2dc5dbfeb2
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
bin/named/server.c
View file

@ -14692,13 +14692,13 @@ named_server_nta(named_server_t *server, isc_lex_t *lex,
"added NTA '%s' (%d sec) in view '%s'",
namebuf, ntattl, view->name);
} else {
bool removed;
bool wasremoved;
result = dns_ntatable_delete(ntatable, ntaname);
if (result == ISC_R_SUCCESS) {
removed = true;
wasremoved = true;
} else if (result == ISC_R_NOTFOUND) {
removed = false;
wasremoved = false;
} else {
goto cleanup;
}
@ -14709,13 +14709,13 @@ named_server_nta(named_server_t *server, isc_lex_t *lex,
first = false;
CHECK(putstr(text, "Negative trust anchor "));
CHECK(putstr(text, removed ? "removed: "
: "not found: "));
CHECK(putstr(text, wasremoved ? "removed: "
: "not found: "));
CHECK(putstr(text, namebuf));
CHECK(putstr(text, "/"));
CHECK(putstr(text, view->name));
if (removed) {
if (wasremoved) {
isc_log_write(named_g_lctx,
NAMED_LOGCATEGORY_GENERAL,
NAMED_LOGMODULE_SERVER,