sdig flags

diff --git a/pdns/sdig.cc b/pdns/sdig.cc
index daaa87763c6b64040f515b78282537385cef779d..e5b040823b1d5bd60a653128b64f5fe09beaf23d 100644 (file)
--- a/pdns/sdig.cc
+++ b/pdns/sdig.cc
@@ -19,7 +19,7 @@ try
   reportAllTypes();
 
   if(argc < 5) {
-    cerr<<"Syntax: sdig IP-address port question question-type [dnssec|dnssec-tcp|recurse|hidesoadetails] [showflags]\n";
+    cerr<<"Syntax: sdig IP-address port question question-type [dnssec] [recurse] [showflags] [hidesoadetails] [tcp]\n";
     exit(EXIT_FAILURE);
   }
 
@@ -29,20 +29,16 @@ try
         dnssec=true;
       if (strcmp(argv[i], "recurse") == 0)
         recurse=true;
+      if (strcmp(argv[i], "showflags") == 0)
+        showflags=true;
       if (strcmp(argv[i], "hidesoadetails") == 0)
         hidesoadetails=true;
-      if (strcmp(argv[i], "dnssec-tcp") == 0) {
-        dnssec=true;
+      if (strcmp(argv[i], "tcp") == 0) {
         tcp=true;
       }
     }
   }
 
-  if((argc > 5 && strcmp(argv[5], "showflags")==0) || (argc > 6 && strcmp(argv[6], "showflags")==0))
-  {
-    showflags=true;
-  }
-
   vector<uint8_t> packet;
   
   DNSPacketWriter pw(packet, argv[3], DNSRecordContent::TypeToNumber(argv[4]));

diff --git a/regression-tests/cname-wildcard-chain/command b/regression-tests/cname-wildcard-chain/command
index f48f0a46daed8d90632c854822c4c165f899f8f0..a37182d431508b7a72ca6b4f6e1d4dae4799408b 100755 (executable)
--- a/regression-tests/cname-wildcard-chain/command
+++ b/regression-tests/cname-wildcard-chain/command
@@ -1,3 +1,3 @@
 #!/bin/sh
-cleandig start.example.com A dnssec-tcp
+cleandig start.example.com A dnssec tcp