repo: resdb
action: commit
revision: 
path_from: 
revision_from: 1b53ae755a154e5d3adbcc66546eba63e0d6f178:
path_to: 
revision_to: 
git.thebackupbox.net
resdb
git clone git://git.thebackupbox.net/resdb
commit 1b53ae755a154e5d3adbcc66546eba63e0d6f178
Author: epoch 
Date:   Sun Oct 6 10:21:44 2013 +0000

    whoisd... don't remember.
    added ipv6 address for my nameserver
    does anyone still use bind_tld_zonefile?
    upgraded bind_tld_zonefile.sh to use ipv6 in one place and rDNS in another

diff --git a/contrib/whoisd/whoisd.pl b/contrib/whoisd/whoisd.pl
index 5b9aa541031c533c9a7a8bf6241be87093e0552f..
index ..f0ea59d28ad336f86bbe591e0a52fa288abbaa28 100755
--- a/contrib/whoisd/whoisd.pl
+++ b/contrib/whoisd/whoisd.pl
@@ -8,6 +8,7 @@ use strict;

 my $RESDB = "/services/resdb/resdb";

+my $HACK=0;
 my $QUERY=;
 $QUERY =~ s/\r\n//g;
 my $out;
@@ -16,6 +17,15 @@ my $value;
 my @parts;
 my $i;

+if($QUERY eq "!!\n") {
+ $QUERY=;
+ $QUERY =~ s/^!r(.+?)[\/,].*$/\1/;
+ printf "A500\n"; #fake this I guess. Does it even use that number for anything?
+ printf "%% Looks like you're trying -A on a BSDian traceroute with this server.\n";
+ printf "%% support will come soon for that.\n";
+ $HACK=1;
+}
+
 # ASNs
 if($QUERY =~ m/^AS(.+?)$/) {
  printf "%% AS section for %s\n", $QUERY;
@@ -39,12 +49,12 @@ if($QUERY =~ m/^AS(.+?)$/) {

 # IPv4 addresses
 if($QUERY =~ m/^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/) {
- printf "%% IP section for %s\n", $QUERY;
+ printf "%% IP section for %s", $QUERY unless $HACK;
  chdir("$RESDB/db/ip");
  @parts=split(/\./,$QUERY);
  for($i=0;$i=0;$i--) {
-  chdir($parts[$i]);
+ for($i=scalar(@parts)-1;$i>scalar(@parts)-3;$i--) {
+  if(!chdir($parts[$i])) {
+   printf "%-20s %s", "warning" . ":", "domain not found.";
+   exit;
+  }
  }
  foreach(split(/\n/,`grep '' -r .`)) {
   $out = $_;
@@ -81,7 +94,7 @@ if($QUERY =~ m/\./) {
 }

 # default to assuming it is a name.
-printf "%% user section for %s\n", $QUERY;
+printf "%% user section for %s\n", $QUERY unless $HACK;

 chdir("$RESDB/db/usr");
 if(chdir($QUERY)) {
@@ -90,16 +103,17 @@ if(chdir($QUERY)) {
   $out =~ s/^\.\///g;
   $out =~ m/^(.+?):(.+?)$/;
   ($title, $value) = ($1, $2);
-  printf "%-20s %s\n", $title . ":", $value;
+  printf "%-20s %s\n", $title . ":", $value unless $HACK;
  }
 } else {
- printf "%-20s missing db/usr file.\n", "warning" . ":";
+ printf "%-20s missing db/usr file.\n", "warning" . ":" unless $HACK;
 }
 chdir("$RESDB/db/as");
 foreach(split(/\n/,`grep '^$QUERY\$' */owner | cut -d/ -f1`)) {
  $out = $_;
  $out =~ s/\n//g;
- printf "%-20s %s\n", "ASN" . ":", $out;
+ printf "%-20s AS%s\n", "origin" . ":", $out if $HACK;
+ printf "%-20s AS%s\n", "origin" . ":", $out unless $HACK;
 }

 foreach(split(/\n/,`grep -i -e "^$QUERY\$" "$RESDB/db/dom"/*/*/owner`)) {
diff --git a/db/dom/ano/allowed/ns/ns6.allowed.ano b/db/dom/ano/allowed/ns/ns6.allowed.ano
new file mode 100644
index 0000000000000000000000000000000000000000..542e31ae684251b224212dd67ab6527e4df635e2
--- /dev/null
+++ b/db/dom/ano/allowed/ns/ns6.allowed.ano
@@ -0,0 +1 @@
+fd63:1e39:6f73:2929::1
diff --git a/scripts/nameserver_autogen/bind_tld_zonefile b/scripts/nameserver_autogen/bind_tld_zonefile
index 344bb4e405993de8b75f352669ded016b5d43b20..
index ..fb224e58b5b68ed8c4288e813978086592bfc954 100755
--- a/scripts/nameserver_autogen/bind_tld_zonefile
+++ b/scripts/nameserver_autogen/bind_tld_zonefile
@@ -1,4 +1,5 @@
 #!/usr/bin/php
+#does anyone use this?
 
index 72c11287cb8fceee349daee7cdbc7a569413bae7..
index ..06eb802d9999c13744f7ced05ab0c91b1f5e7fa1 100755
--- a/scripts/nameserver_autogen/bind_tld_zonefile.sh
+++ b/scripts/nameserver_autogen/bind_tld_zonefile.sh
@@ -3,33 +3,57 @@
 #be sure to edit these variables first.

 ANO_ZONEFILE=/etc/namedb/ano
+RDNS_ZONEFILE=/etc/namedb/1.in-addr.arpa
 RESDB_PATH=/services/resdb/resdb

-echo "; this zonefile genreated on: `date`" > $ANO_ZONEFILE
-echo '$TTL 3600' >> $ANO_ZONEFILE
-echo '@ IN SOA localns root ('`date +" %Y%m%d00"`' 60 300 3600000 3600 )' >> $ANO_ZONEFILE
-echo '@ IN NS localns' >> $ANO_ZONEFILE
-echo 'localns IN A 127.0.0.1' >> $ANO_ZONEFILE

 cd ${RESDB_PATH}/db/dom/ano

-echo -n generating zonefile... 
+echo -n "generating ipv4 reverse lookup zonefile for 1/8..."
+
+echo "; this zonefile genreated on: `date`" > "$RDNS_ZONEFILE"
+echo '$TTL 3600' >> "$RDNS_ZONEFILE"
+echo '@ IN SOA localhost. root.localhost. ('`date +" %Y%m%d%H"`' 60 300 3600000 3600 )' >> "$RDNS_ZONEFILE"
+echo '@ IN NS localhost.' >> "$RDNS_ZONEFILE"
+echo 'localhost. IN A 127.0.0.1' >> "$RDNS_ZONEFILE"
+
+for i in `ls /services/resdb/resdb/db/ip/01/*/*/ns/*`;do
+ f=$(basename $i)
+ a=$(basename $(dirname $i))
+ b=$(basename $(dirname $(dirname $i)))
+ c=$(basename $(dirname $(dirname $(dirname $i))))
+ printf "%d.%d IN NS %s\n" $[0x${b}] $[0x${c}] ${f}.
+done >> "$RDNS_ZONEFILE"
+echo done.
+
+echo -n generating .ano TLD zonefile... 
+
+echo "; this zonefile genreated on: `date`" > "$ANO_ZONEFILE"
+echo '$TTL 3600' >> "$ANO_ZONEFILE"
+echo '@ IN SOA localhost. root.localhost. ('`date +" %Y%m%d%H"`' 60 300 3600000 3600 )' >> "$ANO_ZONEFILE"
+echo '@ IN NS localhost.' >> "$ANO_ZONEFILE"
+echo 'localhost. IN A 127.0.0.1' >> "$ANO_ZONEFILE"
+
 for name in *;do
  if [ -e "${name}/ns/" ];then
   for server in "$name"/ns/*;do
-   if grep '\.ano$' <<< $name > /dev/null;then
+   if grep '\.ano$' <<< "$name" > /dev/null;then
     true
    fi
-   if grep '\.ano$' <<< $server > /dev/null;then
+   if grep '\.ano$' <<< "$server" > /dev/null;then
     true
    fi
    fqserver=`cut -d/ -f3- <<< $server`
    echo -e "${name}\tIN NS\t${fqserver}."
    for ip in `cat ${server}`;do 
-    echo -e "${fqserver}.\tIN A\t$ip"
+    if grep ':' <<< "$ip" > /dev/null;then
+     echo -e "${fqserver}.\tIN AAAA\t$ip"
+    else
+     echo -e "${fqserver}.\tIN A\t$ip"
+    fi
    done
   done
  fi
-done >> $ANO_ZONEFILE
+done >> "$ANO_ZONEFILE"
 echo done.
 echo might want to send a sighup to your named now.

-----END OF PAGE-----