Rename notify to pdns_notify to avoid conflicts

Note that this does not change regression-tests.recursor for now,
because that needs a newer pdns-tools deb.

diff --git a/build-scripts/build-auth-rpm b/build-scripts/build-auth-rpm
index d90dd662609f6e0bb79eec749d9954404ba62f47..e9647f1e0cdef582b4f5be0f25f24c4aec4dbcfc 100755 (executable)
--- a/build-scripts/build-auth-rpm
+++ b/build-scripts/build-auth-rpm
@@ -243,7 +243,7 @@ fi
 %{_bindir}/dnswasher
 %{_bindir}/dumresp
 %{_bindir}/ixplore
-%{_bindir}/notify
+%{_bindir}/pdns_notify
 %{_bindir}/nproxy
 %{_bindir}/nsec3dig
 %{_bindir}/saxfr
@@ -258,7 +258,7 @@ fi
 %{_mandir}/man1/dnswasher.1.gz
 %{_mandir}/man1/dumresp.1.gz
 %{_mandir}/man1/ixplore.1.gz
-%{_mandir}/man1/notify.1.gz
+%{_mandir}/man1/pdns_notify.1.gz
 %{_mandir}/man1/nproxy.1.gz
 %{_mandir}/man1/nsec3dig.1.gz
 %{_mandir}/man1/saxfr.1.gz
@@ -519,7 +519,7 @@ exit 0
 %{_bindir}/dnswasher
 %{_bindir}/dumresp
 %{_bindir}/ixplore
-%{_bindir}/notify
+%{_bindir}/pdns_notify
 %{_bindir}/nproxy
 %{_bindir}/nsec3dig
 %{_bindir}/saxfr
@@ -534,7 +534,7 @@ exit 0
 %{_mandir}/man1/dnswasher.1.gz
 %{_mandir}/man1/dumresp.1.gz
 %{_mandir}/man1/ixplore.1.gz
-%{_mandir}/man1/notify.1.gz
+%{_mandir}/man1/pdns_notify.1.gz
 %{_mandir}/man1/nproxy.1.gz
 %{_mandir}/man1/nsec3dig.1.gz
 %{_mandir}/man1/saxfr.1.gz
@@ -779,7 +779,7 @@ exit 0
 %{_bindir}/dnswasher
 %{_bindir}/dumresp
 %{_bindir}/ixplore
-%{_bindir}/notify
+%{_bindir}/pdns_notify
 %{_bindir}/nproxy
 %{_bindir}/nsec3dig
 %{_bindir}/saxfr
@@ -794,7 +794,7 @@ exit 0
 %{_mandir}/man1/dnswasher.1.gz
 %{_mandir}/man1/dumresp.1.gz
 %{_mandir}/man1/ixplore.1.gz
-%{_mandir}/man1/notify.1.gz
+%{_mandir}/man1/pdns_notify.1.gz
 %{_mandir}/man1/nproxy.1.gz
 %{_mandir}/man1/nsec3dig.1.gz
 %{_mandir}/man1/saxfr.1.gz

diff --git a/build-scripts/debian-authoritative/pdns-tools.install b/build-scripts/debian-authoritative/pdns-tools.install
index d16e803f8ce0f8abb3d942c2385b7171b763e298..dd9d70c4f1634fd519dc657094359e3eb9220194 100644 (file)
--- a/build-scripts/debian-authoritative/pdns-tools.install
+++ b/build-scripts/debian-authoritative/pdns-tools.install
@@ -8,8 +8,8 @@ usr/bin/dnstcpbench
 usr/bin/dnswasher
 usr/bin/dumresp
 usr/bin/ixplore
-usr/bin/notify
 usr/bin/nproxy
 usr/bin/nsec3dig
+usr/bin/pdns_notify
 usr/bin/saxfr
 usr/bin/sdig

diff --git a/build-scripts/debian-authoritative/pdns-tools.manpages b/build-scripts/debian-authoritative/pdns-tools.manpages
index 49ffa00100c663880950e0f34ba8318dc62b7364..afbafe82f88e85c1deb2fd0f9622bc3221bff479 100644 (file)
--- a/build-scripts/debian-authoritative/pdns-tools.manpages
+++ b/build-scripts/debian-authoritative/pdns-tools.manpages
@@ -8,8 +8,8 @@ debian/tmp/usr/share/man/man1/dnstcpbench.1
 debian/tmp/usr/share/man/man1/dnswasher.1
 debian/tmp/usr/share/man/man1/dumresp.1
 debian/tmp/usr/share/man/man1/ixplore.1
-debian/tmp/usr/share/man/man1/notify.1
 debian/tmp/usr/share/man/man1/nproxy.1
 debian/tmp/usr/share/man/man1/nsec3dig.1
+debian/tmp/usr/share/man/man1/pdns_notify.1
 debian/tmp/usr/share/man/man1/saxfr.1
 debian/tmp/usr/share/man/man1/sdig.1

diff --git a/build-scripts/test-auth b/build-scripts/test-auth
index db14644717eaabb1f8fe201834d5c5c2e5af3c28..aa2e5e06929e303b338802641a8ee210d8e3ef47 100755 (executable)
--- a/build-scripts/test-auth
+++ b/build-scripts/test-auth
@@ -19,7 +19,7 @@ export PDNS=/usr/sbin/pdns_server
 export PDNS2=$PDNS
 export SDIG=/usr/bin/sdig
 export NSEC3DIG=/usr/bin/nsec3dig
-export NOTIFY=/usr/bin/notify
+export NOTIFY=/usr/bin/pdns_notify
 export SAXFR=/usr/bin/saxfr
 export ZONE2SQL=/usr/bin/zone2sql
 export PDNSUTIL=/usr/bin/pdnsutil

diff --git a/docs/Makefile.am b/docs/Makefile.am
index 179a241f031060a6c405257d312c0992f667bfc3..0b3ffe38861c57caad7ef271b0d8b375163fb61c 100644 (file)
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -15,7 +15,7 @@ MANPAGES_TARGET_TOOLS = calidns.1 \
        dnswasher.1 \
        dumresp.1 \
        ixplore.1 \
-       notify.1 \
+       pdns_notify.1 \
        nproxy.1 \
        nsec3dig.1 \
        saxfr.1 \

diff --git a/docs/manpages/notify.1.md b/docs/manpages/notify.1.md
deleted file mode 100644 (file)
index 166bcca..0000000
--- a/docs/manpages/notify.1.md
+++ /dev/null
@@ -1,16 +0,0 @@
-% NOTIFY(1)
-% PowerDNS.com BV
-% April 2016
-
-# NAME
-**notify** - A simple DNS NOTIFY sender
-
-# SYNOPSIS
-**notify** *IP_ADDRESS*[:*PORT*] *DOMAIN*
-
-# DESCRIPTION
-**notify** sends a DNS NOTIFY message to *IP_ADDRESS*, by default on port 53, for
-*DOMAIN* and prints the remote nameserver's response.
-
-# OPTIONS
-None

diff --git a/docs/manpages/pdns_notify.1.md b/docs/manpages/pdns_notify.1.md
new file mode 100644 (file)
index 0000000..f189240
--- /dev/null
+++ b/docs/manpages/pdns_notify.1.md
@@ -0,0 +1,16 @@
+% PDNS_NOTIFY(1)
+% PowerDNS.com BV
+% April 2016
+
+# NAME
+**pdns_notify** - A simple DNS NOTIFY sender
+
+# SYNOPSIS
+**pdns_notify** *IP_ADDRESS*[:*PORT*] *DOMAIN*
+
+# DESCRIPTION
+**pdns_notify** sends a DNS NOTIFY message to *IP_ADDRESS*, by default on port 53, for
+*DOMAIN* and prints the remote nameserver's response.
+
+# OPTIONS
+None

diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml
index 6294f5d7dddc88563183bf37aa502a5bafb41d3d..c42674a6f0f6e6bd2332ed742426aa98acc48ba5 100644 (file)
--- a/docs/mkdocs.yml
+++ b/docs/mkdocs.yml
@@ -98,7 +98,7 @@ pages:
     - 'Manpage: dnstcpbench.1': manpages/dnstcpbench.1.md
     - 'Manpage: dnswasher.1': manpages/dnswasher.1.md
     - 'Manpage: ixplore.1': manpages/ixplore.1.md
-    - 'Manpage: notify.1': manpages/notify.1.md
+    - 'Manpage: pdns_notify.1': manpages/pdns_notify.1.md
     - 'Manpage: nproxy.1': manpages/nproxy.1.md
     - 'Manpage: nsec3dig.1': manpages/nsec3dig.1.md
     - 'Manpage: saxfr.1': manpages/saxfr.1.md

diff --git a/pdns/.gitignore b/pdns/.gitignore
index 2f5bc3fa639f5c63bb355151780ba408b4fca6ba..e48ccf4081311baca19d95811a499aeb5124ee7e 100644 (file)
--- a/pdns/.gitignore
+++ b/pdns/.gitignore
@@ -31,7 +31,7 @@
 /dnswasher
 /ixplore
 /kvresp
-/notify
+/pdns_notify
 /nproxy
 /speedtest
 /tcpbench

diff --git a/pdns/Makefile.am b/pdns/Makefile.am
index 7332a7c80f28efed14356366e8e2a188443eb55a..de08741b18cffbd3202a39f6514544a28cbea20f 100644 (file)
--- a/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@ -86,7 +86,7 @@ bin_PROGRAMS += \
        dnstcpbench \
        dnswasher \
        dumresp \
-       notify \
+       pdns_notify \
        nproxy \
        nsec3dig \
        saxfr \
@@ -114,7 +114,7 @@ EXTRA_PROGRAMS = \
        dumresp \
        kvresp \
        ixplore \
-       notify \
+       pdns_notify \
        nproxy \
        nsec3dig \
        saxfr \
@@ -923,7 +923,7 @@ nproxy_LDADD = \
        $(OPENSSL_LIBS) \
        $(BOOST_PROGRAM_OPTIONS_LIBS)
 
-notify_SOURCES = \
+pdns_notify_SOURCES = \
        arguments.cc \
        base32.cc \
        base64.cc base64.hh \
@@ -944,12 +944,12 @@ notify_SOURCES = \
        statbag.cc \
        unix_utility.cc
 
-notify_LDFLAGS = \
+pdns_notify_LDFLAGS = \
        $(AM_LDFLAGS) \
        $(OPENSSL_LDFLAGS) \
        $(BOOST_PROGRAM_OPTIONS_LDFLAGS)
 
-notify_LDADD = \
+pdns_notify_LDADD = \
        $(OPENSSL_LIBS) \
        $(BOOST_PROGRAM_OPTIONS_LIBS)
 

diff --git a/pdns/notify.cc b/pdns/notify.cc
index c07514c2f0217dcccc23e8830f657ef1d2df25f1..1d7b22f423e851ba7c7b5c5013d9677eb2066f30 100644 (file)
--- a/pdns/notify.cc
+++ b/pdns/notify.cc
@@ -32,7 +32,7 @@ ArgvMap &arg()
 }
 
 void usage() {
-  cerr<<"Syntax: notify IP_ADDRESS[:PORT] DOMAIN"<<endl;
+  cerr<<"Syntax: pdns_notify IP_ADDRESS[:PORT] DOMAIN"<<endl;
 }
 
 int main(int argc, char** argv)

diff --git a/regression-tests/runtests b/regression-tests/runtests
index e030e1f1c6b8402ce14b674c3f6442e6bc57d7d2..45f11992f8e82ffabebd16f1fa0999515b764983 100755 (executable)
--- a/regression-tests/runtests
+++ b/regression-tests/runtests
@@ -7,7 +7,7 @@ export PDNS2=${PDNS2:-${PWD}/../pdns/pdns_server}
 export PDNSRECURSOR=${PDNSRECURSOR:-${PWD}/../pdns_recursor}
 export RECCONTROL=${RECCONTROL:-${PWD}/../rec_control}
 export SDIG=${SDIG:-${PWD}/../pdns/sdig}
-export NOTIFY=${NOTIFY:-${PWD}/../pdns/notify}
+export NOTIFY=${NOTIFY:-${PWD}/../pdns/pdns_notify}
 export NSEC3DIG=${NSEC3DIG:-${PWD}/../pdns/nsec3dig}
 export SAXFR=${SAXFR:-${PWD}/../pdns/saxfr}
 export ZONE2SQL=${ZONE2SQL:-${PWD}/../pdns/zone2sql}

diff --git a/regression-tests/start-test-stop b/regression-tests/start-test-stop
index b7f8f5f093dbb5cc776b5c0b50aef28f2204b116..600484c93e72cd6d36991233325927a52924596d 100755 (executable)
--- a/regression-tests/start-test-stop
+++ b/regression-tests/start-test-stop
@@ -9,7 +9,7 @@ export PDNS2=${PDNS2:-${PWD}/../pdns/pdns_server}
 export PDNSRECURSOR=${PDNSRECURSOR:-${PWD}/../pdns_recursor}
 export RECCONTROL=${RECCONTROL:-${PWD}/../rec_control}
 export SDIG=${SDIG:-${PWD}/../pdns/sdig}
-export NOTIFY=${NOTIFY:-${PWD}/../pdns/notify}
+export NOTIFY=${NOTIFY:-${PWD}/../pdns/pdns_notify}
 export NSEC3DIG=${NSEC3DIG:-${PWD}/../pdns/nsec3dig}
 export SAXFR=${SAXFR:-${PWD}/../pdns/saxfr}
 export ZONE2SQL=${ZONE2SQL:-${PWD}/../pdns/zone2sql}