2 files changed, 17 insertions, 4 deletions

diff --git a/plugins/check_dig.c b/plugins/check_dig.c
index d9481f2d..d899b119 100644
--- a/plugins/check_dig.c
+++ b/plugins/check_dig.c
@@ -94,8 +94,8 @@ main (int argc, char **argv)
   timeout_interval_dig = timeout_interval / number_tries + number_tries;
 
   /* get the command to run */
-  xasprintf (&command_line, "%s @%s -p %d %s -t %s %s %s +tries=%d +time=%d",
-            PATH_TO_DIG, dns_server, server_port, query_address, record_type, dig_args, query_transport, number_tries, timeout_interval_dig);
+  xasprintf (&command_line, "%s %s %s -p %d @%s %s %s +tries=%d +time=%d",
+            PATH_TO_DIG, dig_args, query_transport, server_port, dns_server, query_address, record_type, number_tries, timeout_interval_dig);
 
   alarm (timeout_interval);
   gettimeofday (&tv, NULL);
@@ -296,7 +296,10 @@ process_arguments (int argc, char **argv)
       dns_server = argv[c];
     }
     else {
-      dns_server = strdup ("127.0.0.1");
+      if (strcmp(query_transport,"-6") == 0)
+        dns_server = strdup("::1");
+      else
+        dns_server = strdup ("127.0.0.1");
     }
   }
 
diff --git a/plugins/t/check_dns.t b/plugins/t/check_dns.t
index b8858807..035e7682 100644
--- a/plugins/t/check_dns.t
+++ b/plugins/t/check_dns.t
@@ -10,7 +10,7 @@ use NPTest;
 
 plan skip_all => "check_dns not compiled" unless (-x "check_dns");
 
-plan tests => 14;
+plan tests => 16;
 
 my $successOutput = '/DNS OK: [\.0-9]+ seconds? response time/';
 
@@ -43,6 +43,12 @@ my $dns_server       = getTestParameter(
                         "A non default (remote) DNS server",
                         );
 
+my $host_nonresponsive = getTestParameter(
+                        "NP_HOST_NONRESPONSIVE",
+                        "The hostname of system not responsive to network requests",
+                        "10.0.0.1",
+                        );
+
 my $res;
 
 $res = NPTest->testCmd("./check_dns -H $hostname_valid -t 5");
@@ -66,6 +72,10 @@ like  ( $res->output, $successOutput, "Output OK" );
 $res = NPTest->testCmd("./check_dns -H $hostname_invalid -s $dns_server -t 1");
 cmp_ok( $res->return_code, '==', 2, "Invalid $hostname_invalid on $dns_server");
 
+$res = NPTest->testCmd("./check_dns -H $hostname_valid -a $hostname_valid_ip -s $host_nonresponsive -t 2");
+cmp_ok( $res->return_code, '==', 2, "Got no answer from unresponsive server");
+like  ( $res->output, "/CRITICAL - /", "Output OK");
+
 $res = NPTest->testCmd("./check_dns -H $hostname_valid -a $hostname_valid_ip -t 5");
 cmp_ok( $res->return_code, '==', 0, "Got expected address");