Imported Debian patch 4.0.5-6~numeezy

install/share/bind.named.conf.template

@@ -3,7 +3,7 @@ options {
 	listen-on-v6 {any;};
 
 	// Put files that named is allowed to write in the data/ directory:
-	directory "$NAMED_VAR_DIR"; // the default
+	directory "/var/named"; // the default
 	dump-file		"data/cache_dump.db";
 	statistics-file		"data/named_stats.txt";
 	memstatistics-file	"data/named_mem_stats.txt";
@@ -14,16 +14,10 @@ options {
 	// Any host is permitted to issue recursive queries
 	allow-recursion { any; };
 
-	tkey-gssapi-keytab "$NAMED_KEYTAB";
-	pid-file "$NAMED_PID";
+	tkey-gssapi-keytab "/etc/named.keytab";
+	pid-file "/run/named/named.pid";
 
 	dnssec-enable yes;
-	dnssec-validation yes;
-
-	/* Path to ISC DLV key */
-	bindkeys-file "$BINDKEYS_FILE";
-
-	managed-keys-directory "$MANAGED_KEYS_DIR";
 };
 
 /* If you want to enable debugging, eg. using the 'rndc trace' command,
@@ -43,8 +37,7 @@ zone "." IN {
 	file "named.ca";
 };
 
-include "$RFC1912_ZONES";
-include "$ROOT_KEY";
+include "/etc/named.rfc1912.zones";
 
 dynamic-db "ipa" {
 	library "ldap.so";