Remove special handling for testing and documentation domains, per RFC

6761 recommendations.

While there:
- Fix invalid syntax in sample slave config.
- Add a message about having syslogd working with BIND9 chroot.

PR:		217915
Reported by:	eserte12 yahoo de
Sponsored by:	Absolight

8 files changed, 39 insertions, 40 deletions

diff --git a/dns/bind9-devel/files/named.conf.in b/dns/bind9-devel/files/named.conf.in
index 254a65f66085..2d23a6592fae 100644
--- a/dns/bind9-devel/files/named.conf.in
+++ b/dns/bind9-devel/files/named.conf.in
@@ -130,7 +130,7 @@ zone "in-addr.arpa" {
 		2620:0:2830:202::132;   // iad.xfr.dns.icann.org
 	};
 	notify no;
-}
+};
 zone "ip6.arpa" {
 	type slave;
 	file "%%ETCDIR%%/slave/ip6.arpa.slave";
@@ -141,7 +141,7 @@ zone "ip6.arpa" {
 		2620:0:2830:202::132;   // iad.xfr.dns.icann.org
 	};
 	notify no;
-}
+};
 */
 
 /*	Serving the following zones locally will prevent any queries
@@ -261,14 +261,6 @@ zone "113.0.203.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db";
 // IPv6 Example Range for Documentation (RFCs 3849 and 6303)
 zone "8.b.d.0.1.0.0.2.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
 
-// Domain Names for Documentation and Testing (BCP 32)
-zone "test" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "example" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "invalid" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "example.com" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "example.net" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "example.org" { type master; file "%%ETCDIR%%/master/empty.db"; };
-
 // Router Benchmark Testing (RFCs 2544 and 5735)
 zone "18.198.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
 zone "19.198.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
diff --git a/dns/bind9-devel/files/pkg-message.in b/dns/bind9-devel/files/pkg-message.in
index 13383a1d0d16..e62ff8197c9a 100644
--- a/dns/bind9-devel/files/pkg-message.in
+++ b/dns/bind9-devel/files/pkg-message.in
@@ -12,6 +12,13 @@
 *                                                                    *
 *     The %%PREFIX%%/etc/rc.d/named script will do that for you.     *
 *                                                                    *
+*      If using syslog to log the BIND9 activity, and using a        *
+*     chroot'ed installation, you will need to tell syslog to        *
+*       install a log socket in the BIND9 chroot by running:         *
+*                                                                    *
+*            # sysrc altlog_proglist+=named                          *
+*                                                                    *
+*    And then restarting syslogd with: service syslogd restart       *
 *                                                                    *
 *                                                                    *
 *   THIS IS A DEVELOPMENT VERSION IF BIND, IT WILL EAT YOUR DATA     *
diff --git a/dns/bind910/files/named.conf.in b/dns/bind910/files/named.conf.in
index 254a65f66085..2d23a6592fae 100644
--- a/dns/bind910/files/named.conf.in
+++ b/dns/bind910/files/named.conf.in
@@ -130,7 +130,7 @@ zone "in-addr.arpa" {
 		2620:0:2830:202::132;   // iad.xfr.dns.icann.org
 	};
 	notify no;
-}
+};
 zone "ip6.arpa" {
 	type slave;
 	file "%%ETCDIR%%/slave/ip6.arpa.slave";
@@ -141,7 +141,7 @@ zone "ip6.arpa" {
 		2620:0:2830:202::132;   // iad.xfr.dns.icann.org
 	};
 	notify no;
-}
+};
 */
 
 /*	Serving the following zones locally will prevent any queries
@@ -261,14 +261,6 @@ zone "113.0.203.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db";
 // IPv6 Example Range for Documentation (RFCs 3849 and 6303)
 zone "8.b.d.0.1.0.0.2.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
 
-// Domain Names for Documentation and Testing (BCP 32)
-zone "test" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "example" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "invalid" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "example.com" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "example.net" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "example.org" { type master; file "%%ETCDIR%%/master/empty.db"; };
-
 // Router Benchmark Testing (RFCs 2544 and 5735)
 zone "18.198.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
 zone "19.198.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
diff --git a/dns/bind910/files/pkg-message.in b/dns/bind910/files/pkg-message.in
index eb26dbbe1413..a1bfad91fb81 100644
--- a/dns/bind910/files/pkg-message.in
+++ b/dns/bind910/files/pkg-message.in
@@ -12,4 +12,12 @@
 *                                                                    *
 *     The %%PREFIX%%/etc/rc.d/named script will do that for you.     *
 *                                                                    *
+*      If using syslog to log the BIND9 activity, and using a        *
+*     chroot'ed installation, you will need to tell syslog to        *
+*       install a log socket in the BIND9 chroot by running:         *
+*                                                                    *
+*            # sysrc altlog_proglist+=named                          *
+*                                                                    *
+*    And then restarting syslogd with: service syslogd restart       *
+*                                                                    *
 **********************************************************************
diff --git a/dns/bind911/files/named.conf.in b/dns/bind911/files/named.conf.in
index 254a65f66085..2d23a6592fae 100644
--- a/dns/bind911/files/named.conf.in
+++ b/dns/bind911/files/named.conf.in
@@ -130,7 +130,7 @@ zone "in-addr.arpa" {
 		2620:0:2830:202::132;   // iad.xfr.dns.icann.org
 	};
 	notify no;
-}
+};
 zone "ip6.arpa" {
 	type slave;
 	file "%%ETCDIR%%/slave/ip6.arpa.slave";
@@ -141,7 +141,7 @@ zone "ip6.arpa" {
 		2620:0:2830:202::132;   // iad.xfr.dns.icann.org
 	};
 	notify no;
-}
+};
 */
 
 /*	Serving the following zones locally will prevent any queries
@@ -261,14 +261,6 @@ zone "113.0.203.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db";
 // IPv6 Example Range for Documentation (RFCs 3849 and 6303)
 zone "8.b.d.0.1.0.0.2.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
 
-// Domain Names for Documentation and Testing (BCP 32)
-zone "test" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "example" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "invalid" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "example.com" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "example.net" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "example.org" { type master; file "%%ETCDIR%%/master/empty.db"; };
-
 // Router Benchmark Testing (RFCs 2544 and 5735)
 zone "18.198.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
 zone "19.198.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
diff --git a/dns/bind911/files/pkg-message.in b/dns/bind911/files/pkg-message.in
index eb26dbbe1413..a1bfad91fb81 100644
--- a/dns/bind911/files/pkg-message.in
+++ b/dns/bind911/files/pkg-message.in
@@ -12,4 +12,12 @@
 *                                                                    *
 *     The %%PREFIX%%/etc/rc.d/named script will do that for you.     *
 *                                                                    *
+*      If using syslog to log the BIND9 activity, and using a        *
+*     chroot'ed installation, you will need to tell syslog to        *
+*       install a log socket in the BIND9 chroot by running:         *
+*                                                                    *
+*            # sysrc altlog_proglist+=named                          *
+*                                                                    *
+*    And then restarting syslogd with: service syslogd restart       *
+*                                                                    *
 **********************************************************************
diff --git a/dns/bind99/files/named.conf.in b/dns/bind99/files/named.conf.in
index 254a65f66085..2d23a6592fae 100644
--- a/dns/bind99/files/named.conf.in
+++ b/dns/bind99/files/named.conf.in
@@ -130,7 +130,7 @@ zone "in-addr.arpa" {
 		2620:0:2830:202::132;   // iad.xfr.dns.icann.org
 	};
 	notify no;
-}
+};
 zone "ip6.arpa" {
 	type slave;
 	file "%%ETCDIR%%/slave/ip6.arpa.slave";
@@ -141,7 +141,7 @@ zone "ip6.arpa" {
 		2620:0:2830:202::132;   // iad.xfr.dns.icann.org
 	};
 	notify no;
-}
+};
 */
 
 /*	Serving the following zones locally will prevent any queries
@@ -261,14 +261,6 @@ zone "113.0.203.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db";
 // IPv6 Example Range for Documentation (RFCs 3849 and 6303)
 zone "8.b.d.0.1.0.0.2.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
 
-// Domain Names for Documentation and Testing (BCP 32)
-zone "test" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "example" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "invalid" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "example.com" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "example.net" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "example.org" { type master; file "%%ETCDIR%%/master/empty.db"; };
-
 // Router Benchmark Testing (RFCs 2544 and 5735)
 zone "18.198.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
 zone "19.198.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
diff --git a/dns/bind99/files/pkg-message.in b/dns/bind99/files/pkg-message.in
index eb26dbbe1413..a1bfad91fb81 100644
--- a/dns/bind99/files/pkg-message.in
+++ b/dns/bind99/files/pkg-message.in
@@ -12,4 +12,12 @@
 *                                                                    *
 *     The %%PREFIX%%/etc/rc.d/named script will do that for you.     *
 *                                                                    *
+*      If using syslog to log the BIND9 activity, and using a        *
+*     chroot'ed installation, you will need to tell syslog to        *
+*       install a log socket in the BIND9 chroot by running:         *
+*                                                                    *
+*            # sysrc altlog_proglist+=named                          *
+*                                                                    *
+*    And then restarting syslogd with: service syslogd restart       *
+*                                                                    *
 **********************************************************************