3180. [func] Local copies of slave zones are now saved in raw

format by default, to improve startup performance.
			'masterfile-format text;' can be used to override
			the default, if desired. [RT #25867]

bin/tests/system/masterformat/ns2/formerly-text.db.in

@@ -0,0 +1,37 @@
+$ORIGIN .
+$TTL 86400	; 1 day
+transfer3		IN SOA	ns.transfer3. hostmaster.transfer3. (
+				1          ; serial
+				3600       ; refresh (1 hour)
+				1800       ; retry (30 minutes)
+				1814400    ; expire (3 weeks)
+				3          ; minimum (3 seconds)
+				)
+			NS	ns.transfer3.
+$ORIGIN transfer3.
+a			A	10.53.0.1
+			A	10.53.0.2
+aaaa			AAAA	2001:db8::53
+cname			CNAME	cname-target
+dname			DNAME	dname-target
+$TTL 300	; 5 minutes
+dnskey			DNSKEY	256 3 1 (
+				AQPTpWyReB/e9Ii6mVGnakS8hX2zkh/iUYAg+Ge4noWR
+				OpTWOIBvm76zeJPWs4Zfqa1IsswDIx5Mqeg0zwclz59u
+				ecKsKyx5w9IhtZ8plc4Rb9VIE5x7KNHAYTvTO5d4S8M=
+				) ; ZSK; alg = RSAMD5; key id = 30795
+ds			DS	30795 1 1 (
+				310D27F4D82C1FC2400704EA9939FE6E1CEAA3B9 )
+$TTL 86400	; 1 day
+mx			MX	10 mail
+ns			A	10.53.0.1
+$TTL 600	; 10 minutes
+nsec			NSEC	nsecnext.transfer3. NS DS RRSIG NSEC
+$TTL 300	; 5 minutes
+rrsig			RRSIG	SOA 1 0 300 (
+				20050714214747 20050614214747 30795 .
+				yi/RRPAQmn6rnjDQaCqVValBa+ICF00ZldKfZSDaoew5
+				mMUh83DlrrPPNeAxrzMSNzDGlJ6PfdyIFgzPn/CvthF4
+				kjBUAiJTp4r2zhlaUJQ+QFo+drYXYgVJo6aA36fj )
+$TTL 86400	; 1 day
+txt			TXT	"this is text"

bin/tests/system/masterformat/ns2/named.conf

@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.4 2007/06/19 23:47:04 tbox Exp $ */
+/* $Id: named.conf,v 1.5 2011/10/26 15:23:37 each Exp $ */
 
 // NS2
 
@@ -24,6 +24,7 @@ options {
 	pid-file "named.pid";
 	listen-on port 5300 { 10.53.0.2; };
 	listen-on-v6 { none; };
+        port 5300;
 	recursion no;
 	notify no;
 	dnssec-enable yes;
@@ -33,3 +34,22 @@ zone "example" {
 	type master;
 	file "example.db";
 };
+
+zone "transfer1" {
+        type slave;
+        masters { 10.53.0.1; };
+        file "transfer.db.raw";
+};
+
+zone "transfer2" {
+        type slave;
+        masters { 10.53.0.1; };
+        masterfile-format text;
+        file "transfer.db.txt";
+};
+
+zone "transfer3" {
+        type slave;
+        masters { 10.53.0.1; };
+        file "formerly-text.db";
+};