upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-05-25 02:47:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '716-remove-logically-dead-code-try-2' into 'master'

Browse source 
Resolve "remove logically dead code try #2"

Closes #716

See merge request isc-projects/bind9!1103
This commit is contained in:
Mark Andrews 2018-11-22 17:17:43 -05:00
commit 9cf529fa50
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
bin/named/server.c
View file

@ -14416,7 +14416,6 @@ named_server_nta(named_server_t *server, isc_lex_t *lex,
bool ttlset = false, excl = false, viewfound = false;
dns_rdataclass_t rdclass = dns_rdataclass_in;
bool first = true;
bool is_option = true;
UNUSED(force);
@ -14436,10 +14435,8 @@ named_server_nta(named_server_t *server, isc_lex_t *lex,
return (ISC_R_UNEXPECTEDEND);
}
if (!is_option) {
nametext = ptr;
} else if (strcmp(ptr, "--") == 0) {
is_option = false;
if (strcmp(ptr, "--") == 0) {
break;
} else if (argcheck(ptr, "dump")) {
dump = true;
} else if (argcheck(ptr, "remove")) {
@ -14526,7 +14523,7 @@ named_server_nta(named_server_t *server, isc_lex_t *lex,
CHECK(ISC_R_FAILURE);
}
/* Get the NTA name. */
/* Get the NTA name if not found above. */
if (nametext == NULL) {
nametext = next_token(lex, text);
}