# HG changeset patch
# User Ivo Smits <Ivo@UCIS.nl>
# Date 1294839004 -3600
# Node ID e70f56fcb80bbb147db3f4138650cbe39ee07897
# Parent  f316fd5e13bf5f5e925be044f9072f9707e605e2# Parent  30b747e3c5d6b9ddb8194324d1cc8dc7d6db62b4
Merge branch 'master' of git://git1.somerandomnick.ano

diff -r 30b747e3c5d6 -r e70f56fcb80b db/as/62487/owner
diff -r 30b747e3c5d6 -r e70f56fcb80b db/dom/ano/1984/ns/ns.1984.ano
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/dom/ano/1984/ns/ns.1984.ano	Wed Jan 12 14:30:04 2011 +0100
@@ -0,0 +1,1 @@
+1.9.8.4
diff -r 30b747e3c5d6 -r e70f56fcb80b db/ip/01/01/7B/cidr
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip/01/01/7B/cidr	Wed Jan 12 14:30:04 2011 +0100
@@ -0,0 +1,1 @@
+1.1.123.0/24
diff -r 30b747e3c5d6 -r e70f56fcb80b db/ip/01/01/7B/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip/01/01/7B/owner	Wed Jan 12 14:30:04 2011 +0100
@@ -0,0 +1,1 @@
+atiti
diff -r 30b747e3c5d6 -r e70f56fcb80b scripts/nameserver_autogen/bind_tld_zonefile
--- a/scripts/nameserver_autogen/bind_tld_zonefile	Wed Jan 12 07:43:33 2011 +0000
+++ b/scripts/nameserver_autogen/bind_tld_zonefile	Wed Jan 12 14:30:04 2011 +0100
@@ -8,11 +8,14 @@
  $servers = scandir($name.'/ns/');
  foreach ($servers as $server) {
   if ($server[0] == '.') continue;
-  print($name.' IN NS '.$server."\n");
+  if (substr($name, -4) == ".ano") $name .= ".";
+  $fqserver = $server;
+  if (substr($server, -4) == ".ano") $fqserver .= ".";
+  print($name.' IN NS '.$fqserver."\n");
   $ips = file($name.'/ns/'.$server, FILE_IGNORE_NEW_LINES |
    FILE_SKIP_EMPTY_LINES);
   foreach ($ips as $ip) {
-   print($server.' IN A '.$ip."\n");
+   print($fqserver.' IN A '.$ip."\n");
   }
  }
 }