Removed listen-on from views.

Changed syntax of grant/deny statements so they now must be inside an
'update-policy' block.

quote rr types when printing grant/deny statements as they can
clash with config file keywords.

Added rcs Id inside comment.

bin/tests/named.conf

@@ -25,7 +25,10 @@ options {
 	transfer-source-v6 4:3:2:1:5:6:7:8;
 
 	directory ".";			// use current directory
-	named-xfer "/usr/libexec/named-xfer";	// _PATH_XFER
+
+# Obsolete
+#	named-xfer "/usr/libexec/named-xfer";	// _PATH_XFER
+
 	dump-file "named_dump.db";  	// _PATH_DUMPFILE
 	pid-file "/var/run/named.pid";  // _PATH_PIDFILE
 	statistics-file "named.stats";  // _PATH_STATS
@@ -40,12 +43,15 @@ options {
 	check-names slave warn;
 	check-names response ignore;
 	host-statistics no;
-	deallocate-on-exit no;		// Painstakingly deallocate all
-					// objects when exiting instead of
-					// letting the OS clean up for us.
-					// Useful a memory leak is suspected.
-					// Final statistics are written to the
-					// memstatistics-file.
+
+# Obsolete
+#	deallocate-on-exit no;		// Painstakingly deallocate all
+#					// objects when exiting instead of
+#					// letting the OS clean up for us.
+#					// Useful a memory leak is suspected.
+#					// Final statistics are written to the
+#					// memstatistics-file.
+
 	datasize default;
 	stacksize default;
 	coresize default;
@@ -53,7 +59,10 @@ options {
 	recursion yes;
 	expert-mode true;		// don't issue warnings for some things
 	fetch-glue yes;
-	fake-iquery no;
+
+# Obsolete
+#	fake-iquery no;
+
 	notify yes;			// send NOTIFY messages.  You can set
 					// notify on a zone-by-zone
 					// basis in the "zone" statement
@@ -62,13 +71,16 @@ options {
 					// don't set this to 'no' unless
 					// you know what you're doing -- older
 					// servers won't like it.
-	multiple-cnames no;		// if yes, then a name my have more
-					// than one CNAME RR.  This use
-					// is non-standard and is not
-					// recommended, but it is available
-					// because previous releases supported
-					// it and it was used by large sites
-					// for load balancing.
+
+# Obsolete
+#	multiple-cnames no;		// if yes, then a name my have more
+#					// than one CNAME RR.  This use
+#					// is non-standard and is not
+#					// recommended, but it is available
+#					// because previous releases supported
+#					// it and it was used by large sites
+#					// for load balancing.
+
 	allow-query { any; };
 	allow-transfer { any; };
 	transfers-in 10;		// DEFAULT_XFERS_RUNNING, cannot be
@@ -176,7 +188,10 @@ options {
 	/*
 	 * IXFR options
      */
-    maintain-ixfr-base no;   // If yes, keep transaction log file for IXFR
+
+# Now called 'provide-ixfr'
+#    maintain-ixfr-base no;   // If yes, keep transaction log file for IXFR
+
     max-ixfr-log-size 20;	 // Not implemented, maximum size the 
 	                         // IXFR transaction log file to grow
 };
@@ -294,13 +309,16 @@ zone "non-default-acl.demo.zone" {
 	//	- certain rdatatype values (such as "key") are config file keywords and
 	// 	  must be quoted or a syntax error will occur.
 	//
-	grant root.domain. subdomain host.domain. A MX CNAME; 
-	grant sub.root.domain. wildcard *.host.domain. A; 
-	grant root.domain. name host.domain. a ns md mf cname soa mb mg 
-		mr "null" wks ptr hinfo minfo mx txt rp afsdb x25
-		isdn rt nsap sig "key" px gpos aaaa loc nxt srv naptr kx 
-		cert a6 dname opt unspec tkey tsig ;
-	grant foo.bar.com. self foo.bar.com. a;
+
+	update-policy {
+		grant root.domain. subdomain host.domain. A MX CNAME; 
+		grant sub.root.domain. wildcard *.host.domain. A; 
+		grant root.domain. name host.domain. a ns md mf cname soa mb mg 
+			mr "null" wks ptr hinfo minfo mx txt rp afsdb x25
+			isdn rt nsap sig "key" px gpos aaaa loc nxt srv naptr kx 
+			cert a6 dname opt unspec tkey tsig ;
+		grant foo.bar.com. self foo.bar.com. a;
+	};
 };
 
 key sample_key {			// for TSIG; supported by parser
@@ -329,7 +347,8 @@ server 1.2.3.4 {
 	keys { "sample_key" };	// for TSIG; supported by the parser
 					// but not yet implemented in the
 					// rest of the server
-	support-ixfr yes;      // for IXFR supported by server
+# Now called 'request-ixfr'
+#	support-ixfr yes;      // for IXFR supported by server
 					// if yes, the listed server talks IXFR 
 };