From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Wed, 9 Sep 2015 16:08:38 +0000 (+0200)
Subject: Add sdig to pdns-tools
X-Git-Tag: dnsdist-1.0.0-alpha1~248^2~52^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1801fa62be04f53660fb2823002ecc622c7a44de;p=pdns

Add sdig to pdns-tools
---

diff --git a/build-scripts/build-auth-rpm b/build-scripts/build-auth-rpm
index 29a1b233c..fa7d90e40 100755
--- a/build-scripts/build-auth-rpm
+++ b/build-scripts/build-auth-rpm
@@ -231,6 +231,7 @@ fi
 %{_bindir}/nproxy
 %{_bindir}/nsec3dig
 %{_bindir}/saxfr
+%{_bindir}/sdig
 %{_mandir}/man1/dnsbulktest.1.gz
 %{_mandir}/man1/dnsgram.1.gz
 %{_mandir}/man1/dnsreplay.1.gz
@@ -240,6 +241,7 @@ fi
 %{_mandir}/man1/dnswasher.1.gz
 %{_mandir}/man1/nsec3dig.1.gz
 %{_mandir}/man1/saxfr.1.gz
+%{_mandir}/man1/sdig.1.gz
 
 %files backend-mysql
 %doc pdns/dnssec.schema.mysql.sql
@@ -490,6 +492,7 @@ exit 0
 %{_bindir}/nproxy
 %{_bindir}/nsec3dig
 %{_bindir}/saxfr
+%{_bindir}/sdig
 %{_mandir}/man1/dnsbulktest.1.gz
 %{_mandir}/man1/dnsgram.1.gz
 %{_mandir}/man1/dnsreplay.1.gz
@@ -499,6 +502,7 @@ exit 0
 %{_mandir}/man1/dnswasher.1.gz
 %{_mandir}/man1/nsec3dig.1.gz
 %{_mandir}/man1/saxfr.1.gz
+%{_mandir}/man1/sdig.1.gz
 
 %files backend-mysql
 %doc modules/gmysqlbackend/schema.mysql.sql
diff --git a/build-scripts/debian-authoritative-semistatic/rules b/build-scripts/debian-authoritative-semistatic/rules
index 6764199c0..d2da226f5 100755
--- a/build-scripts/debian-authoritative-semistatic/rules
+++ b/build-scripts/debian-authoritative-semistatic/rules
@@ -85,7 +85,7 @@ binary-main-prepare:
 
 	#FIXME: shell loops hide errors
 	for prog in dnsbulktest dnsgram dnsreplay dnsscan dnsscope dnstcpbench dnswasher \
-		notify nproxy nsec3dig saxfr ; do \
+		notify nproxy nsec3dig saxfr sdig ; do \
 		mv "$(tmpdir)"/usr/bin/$$prog "$(tools_tmpdir)"/usr/bin ; \
 		[ -e "$(tmpdir)"/usr/share/man/man8/"$$prog".8 ] && \
 			mv "$(tmpdir)"/usr/share/man/man8/"$$prog".8 "$(tools_tmpdir)"/usr/share/man/man8/ ; \
diff --git a/build-scripts/debian-authoritative/pdns-tools.install b/build-scripts/debian-authoritative/pdns-tools.install
index a76d7752a..5fe1e9994 100644
--- a/build-scripts/debian-authoritative/pdns-tools.install
+++ b/build-scripts/debian-authoritative/pdns-tools.install
@@ -7,3 +7,4 @@ usr/bin/dnstcpbench
 usr/bin/dnswasher
 usr/bin/nsec3dig
 usr/bin/saxfr
+usr/bin/sdig
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 39bdaf7a8..95337cc01 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -12,7 +12,8 @@ MANPAGES_TARGET_TOOLS = dnsbulktest.1 \
 	dnstcpbench.1 \
 	dnswasher.1 \
 	nsec3dig.1 \
-	saxfr.1
+	saxfr.1 \
+	sdig.1
 
 MANPAGES_TARGET_DNSDIST = dnsdist.1
 
diff --git a/docs/manpages/sdig.1.md b/docs/manpages/sdig.1.md
new file mode 100644
index 000000000..1b04ad0f6
--- /dev/null
+++ b/docs/manpages/sdig.1.md
@@ -0,0 +1,30 @@
+% SDIG(1)
+% PowerDNS.com BV
+% September 2015
+
+# NAME
+**sdig** - Perform a DNS query and show the results
+
+# SYNOPSIS
+**sdig** *IPADDRESS* *PORT* *QNAME* *QTYPE* [*OPTIONS*]
+
+# DESCRIPTION
+**sdig** sends a DNS query to *IPADDRESS* on port *PORT* and displays the answer
+in a formatted way.
+
+# OPTIONS
+These options can be added to the commandline in any order.
+dnssec
+:    Set the DO bit to request DNSSEC information.
+
+hidesoadetails
+:    Don't show the SOA serial in the response.
+
+recurse
+:    Set the RD bit in the question.
+
+showflags
+:    Show the NSEC3 flags in the response.
+
+tcp
+:    Use TCP instead of UDP to send the query.
diff --git a/pdns/Makefile.am b/pdns/Makefile.am
index b1f94e0ff..8203f0419 100644
--- a/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@ -88,7 +88,8 @@ bin_PROGRAMS += \
 	notify \
 	nproxy \
 	nsec3dig \
-	saxfr
+	saxfr \
+	sdig
 
 if HAVE_RECVMMSG
 bin_PROGRAMS += calidns