Strip unneeded (an, in the case of loop, outright problematic) additional IN's

14 files changed, 76 insertions, 78 deletions

diff --git a/bind/fake/192.168.1-peronard.dk b/bind/fake/192.168.1-peronard.dk
index d8eca4c..58548eb 100644
--- a/bind/fake/192.168.1-peronard.dk
+++ b/bind/fake/192.168.1-peronard.dk
@@ -6,6 +6,6 @@ $TTL	604800
 			2419200		; Expire
 			 604800 )	; Negative Cache TTL
 ;
-@	IN	NS	localhost.
+@		NS	localhost.
 ;
-2	IN	PTR	paf.peronard.dk.
+2		PTR	paf.peronard.dk.
diff --git a/bind/fake/LOCALHOST.LOCAL b/bind/fake/LOCALHOST.LOCAL
index 64ebba5..92dcfa7 100644
--- a/bind/fake/LOCALHOST.LOCAL
+++ b/bind/fake/LOCALHOST.LOCAL
@@ -6,8 +6,8 @@ $TTL	604800
 			2419200		; Expire
 			 604800 )	; Negative Cache TTL
 ;
-@	IN	NS	localhost.
+@		NS	localhost.
 ;
-@		IN	MX	10	localhost.
-@		IN	A	127.0.0.1
-*		IN	A	127.0.0.1
+@		MX	10 localhost.
+@		A	127.0.0.1
+*		A	127.0.0.1
diff --git a/bind/fake/NET0.LOCAL b/bind/fake/NET0.LOCAL
index 69fd150..8ec2452 100644
--- a/bind/fake/NET0.LOCAL
+++ b/bind/fake/NET0.LOCAL
@@ -8,6 +8,6 @@ $TTL	604800
 ;
 @		NS	localhost.
 ;
-$GENERATE 1-9		pc00$	IN	A	10.0.0.$
-$GENERATE 10-99		pc0$	IN	A	10.0.0.$
-$GENERATE 100-254	pc$	IN	A	10.0.0.$
+$GENERATE 1-9		pc00$	A	10.0.0.$
+$GENERATE 10-99		pc0$	A	10.0.0.$
+$GENERATE 100-254	pc$	A	10.0.0.$
diff --git a/bind/fake/NET1-SERVER-100 b/bind/fake/NET1-SERVER-100
index 9e439ea..0fb8e07 100644
--- a/bind/fake/NET1-SERVER-100
+++ b/bind/fake/NET1-SERVER-100
@@ -6,20 +6,19 @@ $TTL	604800
 			2419200		; Expire
 			 604800 )	; Negative Cache TTL
 ;
-@	IN	NS	localhost.
-;
-@	IN	A	192.168.1.100
+@		NS	localhost.
+		A	192.168.1.100
 
-server	IN	A	192.168.1.100
+server		A	192.168.1.100
 
-www	IN	CNAME	server
-dns	IN	CNAME	server
-mail	IN	CNAME	server
-ntp	IN	CNAME	server
-proxy	IN	CNAME	server
-ldap	IN	CNAME	server
-ftp	IN	CNAME	server
-news	IN	CNAME	server
-rip	IN	CNAME	server
+www		CNAME	server
+dns		CNAME	server
+mail		CNAME	server
+ntp		CNAME	server
+proxy		CNAME	server
+ldap		CNAME	server
+ftp		CNAME	server
+news		CNAME	server
+rip		CNAME	server
 
-debian	IN	CNAME	server
+debian		CNAME	server
diff --git a/bind/fake/NET1.LOCAL b/bind/fake/NET1.LOCAL
index da71baf..c55de62 100644
--- a/bind/fake/NET1.LOCAL
+++ b/bind/fake/NET1.LOCAL
@@ -8,6 +8,6 @@ $TTL	604800
 ;
 @		NS	localhost.
 ;
-$GENERATE 1-9		pc00$	IN	A	192.168.1.$
-$GENERATE 10-99		pc0$	IN	A	192.168.1.$
-$GENERATE 100-254	pc$	IN	A	192.168.1.$
+$GENERATE 1-9		pc00$	A	192.168.1.$
+$GENERATE 10-99		pc0$	A	192.168.1.$
+$GENERATE 100-254	pc$	A	192.168.1.$
diff --git a/bind/fake/NET101.LOCAL b/bind/fake/NET101.LOCAL
index ea03681..aad7ee4 100644
--- a/bind/fake/NET101.LOCAL
+++ b/bind/fake/NET101.LOCAL
@@ -8,6 +8,6 @@ $TTL	604800
 ;
 @		NS	localhost.
 ;
-$GENERATE 1-9		pc00$	IN	A	192.168.101.$
-$GENERATE 10-99		pc0$	IN	A	192.168.101.$
-$GENERATE 100-254	pc$	IN	A	192.168.101.$
+$GENERATE 1-9		pc00$	A	192.168.101.$
+$GENERATE 10-99		pc0$	A	192.168.101.$
+$GENERATE 100-254	pc$	A	192.168.101.$
diff --git a/bind/fake/NET102.LOCAL b/bind/fake/NET102.LOCAL
index ae16a61..0242745 100644
--- a/bind/fake/NET102.LOCAL
+++ b/bind/fake/NET102.LOCAL
@@ -8,6 +8,6 @@ $TTL	604800
 ;
 @		NS	localhost.
 ;
-$GENERATE 1-9		pc00$	IN	A	192.168.102.$
-$GENERATE 10-99		pc0$	IN	A	192.168.102.$
-$GENERATE 100-254	pc$	IN	A	192.168.102.$
+$GENERATE 1-9		pc00$	A	192.168.102.$
+$GENERATE 10-99		pc0$	A	192.168.102.$
+$GENERATE 100-254	pc$	A	192.168.102.$
diff --git a/bind/fake/NET103.LOCAL b/bind/fake/NET103.LOCAL
index 6179b16..e44bff3 100644
--- a/bind/fake/NET103.LOCAL
+++ b/bind/fake/NET103.LOCAL
@@ -8,6 +8,6 @@ $TTL	604800
 ;
 @		NS	localhost.
 ;
-$GENERATE 1-9		pc00$	IN	A	192.168.103.$
-$GENERATE 10-99		pc0$	IN	A	192.168.103.$
-$GENERATE 100-254	pc$	IN	A	192.168.103.$
+$GENERATE 1-9		pc00$	A	192.168.103.$
+$GENERATE 10-99		pc0$	A	192.168.103.$
+$GENERATE 100-254	pc$	A	192.168.103.$
diff --git a/bind/fake/NET104.LOCAL b/bind/fake/NET104.LOCAL
index 457cc93..3beaa44 100644
--- a/bind/fake/NET104.LOCAL
+++ b/bind/fake/NET104.LOCAL
@@ -8,6 +8,6 @@ $TTL	604800
 ;
 @		NS	localhost.
 ;
-$GENERATE 1-9		pc00$	IN	A	192.168.104.$
-$GENERATE 10-99		pc0$	IN	A	192.168.104.$
-$GENERATE 100-254	pc$	IN	A	192.168.104.$
+$GENERATE 1-9		pc00$	A	192.168.104.$
+$GENERATE 10-99		pc0$	A	192.168.104.$
+$GENERATE 100-254	pc$	A	192.168.104.$
diff --git a/bind/fake/NET105.LOCAL b/bind/fake/NET105.LOCAL
index a1e73d3..04c6fb5 100644
--- a/bind/fake/NET105.LOCAL
+++ b/bind/fake/NET105.LOCAL
@@ -8,6 +8,6 @@ $TTL	604800
 ;
 @		NS	localhost.
 ;
-$GENERATE 1-9		pc00$	IN	A	192.168.105.$
-$GENERATE 10-99		pc0$	IN	A	192.168.105.$
-$GENERATE 100-254	pc$	IN	A	192.168.105.$
+$GENERATE 1-9		pc00$	A	192.168.105.$
+$GENERATE 10-99		pc0$	A	192.168.105.$
+$GENERATE 100-254	pc$	A	192.168.105.$
diff --git a/bind/fake/NET106.LOCAL b/bind/fake/NET106.LOCAL
index 922da98..c8abac6 100644
--- a/bind/fake/NET106.LOCAL
+++ b/bind/fake/NET106.LOCAL
@@ -8,6 +8,6 @@ $TTL	604800
 ;
 @		NS	localhost.
 ;
-$GENERATE 1-9		pc00$	IN	A	192.168.106.$
-$GENERATE 10-99		pc0$	IN	A	192.168.106.$
-$GENERATE 100-254	pc$	IN	A	192.168.106.$
+$GENERATE 1-9		pc00$	A	192.168.106.$
+$GENERATE 10-99		pc0$	A	192.168.106.$
+$GENERATE 100-254	pc$	A	192.168.106.$
diff --git a/bind/fake/peronard.dk b/bind/fake/peronard.dk
index 6a0cb45..0541d18 100644
--- a/bind/fake/peronard.dk
+++ b/bind/fake/peronard.dk
@@ -6,14 +6,13 @@ $TTL	604800
 				2419200		; Expire
 				 604800 )	; Negative Cache TTL
 ;
-@	IN	NS	localhost.
-;
-@		IN	MX	10	mail
-@		IN	MX	50	mail.haakansson.com.
-@		IN	MX	50	mail.idaskolen.dk.
-@		IN	MX	50	mail.bitbase.dk.
-@		IN	A	62.79.46.157
-mail		IN	A	62.79.46.157
-paf		IN	A	192.168.1.2
+@		NS	localhost.
+		MX	10 mail
+		MX	50 mail.haakansson.com.
+		MX	50 mail.idaskolen.dk.
+		MX	50 mail.bitbase.dk.
+		A	62.79.46.157
+mail		A	62.79.46.157
+paf		A	192.168.1.2
 
-*		IN	A	62.79.46.157
+*		A	62.79.46.157
diff --git a/bind/fake/ror.local b/bind/fake/ror.local
index 68b75dd..5fd0641 100644
--- a/bind/fake/ror.local
+++ b/bind/fake/ror.local
@@ -6,18 +6,18 @@ $TTL	604800
 			2419200		; Expire
 			 604800 )	; Negative Cache TTL
 ;
-@	IN	NS	localhost.
+@		NS	localhost.
 ;
-gateway	IN	A	192.168.1.1
-server	IN	A	192.168.1.2
-www	IN	CNAME	server
-dns	IN	CNAME	server
-mail	IN	CNAME	server
-ntp	IN	CNAME	server
-proxy	IN	CNAME	server
-ldap	IN	CNAME	server
-ftp	IN	CNAME	server
-news	IN	CNAME	server
-rip	IN	CNAME	server
+gateway		A	192.168.1.1
+server		A	192.168.1.2
+www		CNAME	server
+dns		CNAME	server
+mail		CNAME	server
+ntp		CNAME	server
+proxy		CNAME	server
+ldap		CNAME	server
+ftp		CNAME	server
+news		CNAME	server
+rip		CNAME	server
 
-debian	IN	CNAME	server
+debian		CNAME	server
diff --git a/bind/fake/satsbutikken.local b/bind/fake/satsbutikken.local
index cdcb8f0..a3233fb 100644
--- a/bind/fake/satsbutikken.local
+++ b/bind/fake/satsbutikken.local
@@ -6,15 +6,15 @@ $TTL	604800
 			2419200		; Expire
 			 604800 )	; Negative Cache TTL
 ;
-@	IN	NS	localhost.
+@		NS	localhost.
 ;
-gateway	IN	A	192.168.90.2
-www	IN	CNAME	gateway
-dns	IN	CNAME	gateway
-mail	IN	CNAME	gateway
-ntp	IN	CNAME	gateway
-proxy	IN	CNAME	gateway
-ldap	IN	CNAME	gateway
-ftp	IN	CNAME	gateway
-news	IN	CNAME	gateway
-rip	IN	CNAME	gateway
+gateway		A	192.168.90.2
+www		CNAME	gateway
+dns		CNAME	gateway
+mail		CNAME	gateway
+ntp		CNAME	gateway
+proxy		CNAME	gateway
+ldap		CNAME	gateway
+ftp		CNAME	gateway
+news		CNAME	gateway
+rip		CNAME	gateway