# HG changeset patch
# User lex <lex@lynx.ano>
# Date 1294834431 21600
# Node ID 4fbc2e8407b04c5df7bbdd6907e1d990ce62799c
# Parent  59102e1e06f9db31b7e1565d813e55cd3ee96c94# Parent  30b747e3c5d6b9ddb8194324d1cc8dc7d6db62b4
Merge branch 'master' of git://1.0.27.102

diff -r 30b747e3c5d6 -r 4fbc2e8407b0 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 06:13:51 2011 -0600
@@ -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");
   }
  }
 }