Remove bogus comparison

diff --git a/CHANGES b/CHANGES
index 053657cf3a5f4b911ce8ae6c2e5b257da257e1fd..2b11a8a6b30562f7a68cdd6915e7729ae4930d3e 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+4930.  [bug]           Remove a bogus check in nslookup command line
+                       argument processing. [GL #206]
+
 4929.  [func]          Add the ability to set RA and TC in queries made by
                        dig (+[no]raflag, +[no]tcflag). [GL #213]
 

diff --git a/bin/dig/nslookup.c b/bin/dig/nslookup.c
index 16842a239b974f0155fc7317f2f1ea110a809a58..16f4ad34d0f41af279b0d907e33edcbc5d4efaf7 100644 (file)
--- a/bin/dig/nslookup.c
+++ b/bin/dig/nslookup.c
@@ -709,31 +709,31 @@ setoption(char *opt) {
                usesearch = ISC_TRUE;
        } else if (CHECKOPT("nodefname", 5)) {
                usesearch = ISC_FALSE;
-       } else if (CHECKOPT("vc", 2) == 0) {
+       } else if (CHECKOPT("vc", 2)) {
                tcpmode = ISC_TRUE;
                tcpmode_set = ISC_TRUE;
-       } else if (CHECKOPT("novc", 4) == 0) {
+       } else if (CHECKOPT("novc", 4)) {
                tcpmode = ISC_FALSE;
                tcpmode_set = ISC_TRUE;
-       } else if (CHECKOPT("debug", 3) == 0) {
+       } else if (CHECKOPT("debug", 3)) {
                short_form = ISC_FALSE;
                showsearch = ISC_TRUE;
-       } else if (CHECKOPT("nodebug", 5) == 0) {
+       } else if (CHECKOPT("nodebug", 5)) {
                short_form = ISC_TRUE;
                showsearch = ISC_FALSE;
-       } else if (CHECKOPT("d2", 2) == 0) {
+       } else if (CHECKOPT("d2", 2)) {
                debugging = ISC_TRUE;
-       } else if (CHECKOPT("nod2", 4) == 0) {
+       } else if (CHECKOPT("nod2", 4)) {
                debugging = ISC_FALSE;
-       } else if (CHECKOPT("search", 3) == 0) {
+       } else if (CHECKOPT("search", 3)) {
                usesearch = ISC_TRUE;
-       } else if (CHECKOPT("nosearch", 5) == 0) {
+       } else if (CHECKOPT("nosearch", 5)) {
                usesearch = ISC_FALSE;
-       } else if (CHECKOPT("sil", 3) == 0) {
+       } else if (CHECKOPT("sil", 3)) {
                /* deprecation_msg = ISC_FALSE; */
-       } else if (CHECKOPT("fail", 3) == 0) {
+       } else if (CHECKOPT("fail", 3)) {
                nofail=ISC_FALSE;
-       } else if (CHECKOPT("nofail", 5) == 0) {
+       } else if (CHECKOPT("nofail", 5)) {
                nofail=ISC_TRUE;
        } else if (strncasecmp(opt, "ndots=", 6) == 0) {
                set_ndots(&opt[6]);