Commit ac810872 authored by Ondřej Surý's avatar Ondřej Surý
Browse files

Merge branch '206-nslookup-accepts-any-bogus-option-interpret-it-as-vc-v9_11' into 'v9_11'

Resolve "nslookup accepts any -bogus -option, interpret it as -vc"

See merge request !215
parents 901363a3 4f35a810
Pipeline #1335 passed with stages
in 6 minutes and 31 seconds
4930. [bug] Remove a bogus check in nslookup command line
argument processing. [GL #206]
4922. [bug] dnstap: Log the destination address of client 4922. [bug] dnstap: Log the destination address of client
packets rather than the interface address. packets rather than the interface address.
[GL #197] [GL #197]
......
...@@ -721,31 +721,31 @@ setoption(char *opt) { ...@@ -721,31 +721,31 @@ setoption(char *opt) {
usesearch = ISC_TRUE; usesearch = ISC_TRUE;
} else if (CHECKOPT("nodefname", 5)) { } else if (CHECKOPT("nodefname", 5)) {
usesearch = ISC_FALSE; usesearch = ISC_FALSE;
} else if (CHECKOPT("vc", 2) == 0) { } else if (CHECKOPT("vc", 2)) {
tcpmode = ISC_TRUE; tcpmode = ISC_TRUE;
tcpmode_set = ISC_TRUE; tcpmode_set = ISC_TRUE;
} else if (CHECKOPT("novc", 4) == 0) { } else if (CHECKOPT("novc", 4)) {
tcpmode = ISC_FALSE; tcpmode = ISC_FALSE;
tcpmode_set = ISC_TRUE; tcpmode_set = ISC_TRUE;
} else if (CHECKOPT("debug", 3) == 0) { } else if (CHECKOPT("debug", 3)) {
short_form = ISC_FALSE; short_form = ISC_FALSE;
showsearch = ISC_TRUE; showsearch = ISC_TRUE;
} else if (CHECKOPT("nodebug", 5) == 0) { } else if (CHECKOPT("nodebug", 5)) {
short_form = ISC_TRUE; short_form = ISC_TRUE;
showsearch = ISC_FALSE; showsearch = ISC_FALSE;
} else if (CHECKOPT("d2", 2) == 0) { } else if (CHECKOPT("d2", 2)) {
debugging = ISC_TRUE; debugging = ISC_TRUE;
} else if (CHECKOPT("nod2", 4) == 0) { } else if (CHECKOPT("nod2", 4)) {
debugging = ISC_FALSE; debugging = ISC_FALSE;
} else if (CHECKOPT("search", 3) == 0) { } else if (CHECKOPT("search", 3)) {
usesearch = ISC_TRUE; usesearch = ISC_TRUE;
} else if (CHECKOPT("nosearch", 5) == 0) { } else if (CHECKOPT("nosearch", 5)) {
usesearch = ISC_FALSE; usesearch = ISC_FALSE;
} else if (CHECKOPT("sil", 3) == 0) { } else if (CHECKOPT("sil", 3)) {
/* deprecation_msg = ISC_FALSE; */ /* deprecation_msg = ISC_FALSE; */
} else if (CHECKOPT("fail", 3) == 0) { } else if (CHECKOPT("fail", 3)) {
nofail=ISC_FALSE; nofail=ISC_FALSE;
} else if (CHECKOPT("nofail", 5) == 0) { } else if (CHECKOPT("nofail", 5)) {
nofail=ISC_TRUE; nofail=ISC_TRUE;
} else if (strncasecmp(opt, "ndots=", 6) == 0) { } else if (strncasecmp(opt, "ndots=", 6) == 0) {
set_ndots(&opt[6]); set_ndots(&opt[6]);
......
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