Imported Upstream version 4.3.1

install/share/bind.named.conf.template

@@ -4,9 +4,12 @@ options {
 
 	// Put files that named is allowed to write in the data/ directory:
 	directory "$NAMED_VAR_DIR"; // the default
-	dump-file		"${NAMED_DATA_DIR}cache_dump.db";
-	statistics-file		"${NAMED_DATA_DIR}named_stats.txt";
-	memstatistics-file	"${NAMED_DATA_DIR}named_mem_stats.txt";
+	dump-file		"data/cache_dump.db";
+	statistics-file		"data/named_stats.txt";
+	memstatistics-file	"data/named_mem_stats.txt";
+
+	forward first;
+	forwarders {$FORWARDERS};
 
 	// Any host is permitted to issue recursive queries
 	allow-recursion { any; };
@@ -21,9 +24,6 @@ options {
 	bindkeys-file "$BINDKEYS_FILE";
 
 	managed-keys-directory "$MANAGED_KEYS_DIR";
-
-	/* crypto policy snippet on platforms with system-wide policy. */
-	$INCLUDE_CRYPTO_POLICY
 };
 
 /* If you want to enable debugging, eg. using the 'rndc trace' command,
@@ -32,29 +32,27 @@ options {
  */
 logging {
 	channel default_debug {
-		file "${NAMED_DATA_DIR}named.run";
+		file "data/named.run";
 		severity dynamic;
 		print-time yes;
 	};
 };
 
-${NAMED_ZONE_COMMENT}zone "." IN {
-${NAMED_ZONE_COMMENT}	type hint;
-${NAMED_ZONE_COMMENT}	file "named.ca";
-${NAMED_ZONE_COMMENT}};
+zone "." IN {
+	type hint;
+	file "named.ca";
+};
 
 include "$RFC1912_ZONES";
 include "$ROOT_KEY";
 
-/* WARNING: This part of the config file is IPA-managed.
- * Modifications may break IPA setup or upgrades.
- */
-dyndb "ipa" "$BIND_LDAP_SO" {
-	uri "ldapi://%2fvar%2frun%2fslapd-$SERVER_ID.socket";
-	base "cn=dns, $SUFFIX";
-	server_id "$FQDN";
-	auth_method "sasl";
-	sasl_mech "GSSAPI";
-	sasl_user "DNS/$FQDN";
+dynamic-db "ipa" {
+	library "ldap.so";
+	arg "uri ldapi://%2fvar%2frun%2fslapd-$SERVER_ID.socket";
+	arg "base cn=dns, $SUFFIX";
+	arg "fake_mname $FQDN.";
+	arg "auth_method sasl";
+	arg "sasl_mech GSSAPI";
+	arg "sasl_user DNS/$FQDN";
+	arg "serial_autoincrement yes";
 };
-/* End of IPA-managed part. */