repo: resdb
action: commit
revision: 
path_from: 
revision_from: f0900f26b11f08f04ac3ccc1528a471412c8d3a7:
path_to: 
revision_to: 
git.thebackupbox.net
resdb
git clone git://git.thebackupbox.net/resdb
commit f0900f26b11f08f04ac3ccc1528a471412c8d3a7
Author: Nick 
Date:   Thu Jul 7 16:00:12 2011 +0000

    reverting IPv6 changes because too much new complexity and no real benefit

diff --git a/db/dom/ano/jaguar/ns/ns.jaguar.ano/ipv4/0 b/db/dom/ano/jaguar/ns/ns.jaguar.ano
similarity index 100%
rename from db/dom/ano/jaguar/ns/ns.jaguar.ano/ipv4/0
rename to db/dom/ano/jaguar/ns/ns.jaguar.ano
diff --git a/db/dom/ano/jaguar/ns/ns.jaguar.ano/ipv6/0 b/db/dom/ano/jaguar/ns/ns.jaguar.ano/ipv6/0
deleted file mode 100644
index cf7d4c4513674d026381d021f1684ae0db64fefe..0000000000000000000000000000000000000000
--- a/db/dom/ano/jaguar/ns/ns.jaguar.ano/ipv6/0
+++ /dev/null
@@ -1 +0,0 @@
-fd63:1e39:6f73:30a::1
diff --git a/db/dom/ano/lynx/ns/ns.lynx.ano/ipv4/0 b/db/dom/ano/lynx/ns/ns.lynx.ano
similarity index 100%
rename from db/dom/ano/lynx/ns/ns.lynx.ano/ipv4/0
rename to db/dom/ano/lynx/ns/ns.lynx.ano
diff --git a/db/dom/ano/lynx/ns/ns.lynx.ano/ipv6/0 b/db/dom/ano/lynx/ns/ns.lynx.ano/ipv6/0
deleted file mode 100644
index 09b1ee6755986821c717285947009a10ae71f33a..0000000000000000000000000000000000000000
--- a/db/dom/ano/lynx/ns/ns.lynx.ano/ipv6/0
+++ /dev/null
@@ -1 +0,0 @@
-fd63:1e39:6f73:309::1
diff --git a/db/dom/ano/ucis/ns/ns2.ucis.ano/ipv4/0 b/db/dom/ano/ucis/ns/ns2.ucis.ano
similarity index 100%
rename from db/dom/ano/ucis/ns/ns2.ucis.ano/ipv4/0
rename to db/dom/ano/ucis/ns/ns2.ucis.ano
diff --git a/db/dom/ano/ucis/ns/ns2.ucis.ano/ipv6/0 b/db/dom/ano/ucis/ns/ns2.ucis.ano/ipv6/0
deleted file mode 100644
index af038c36cfea993ba2c4470430d6cbb223993d33..0000000000000000000000000000000000000000
--- a/db/dom/ano/ucis/ns/ns2.ucis.ano/ipv6/0
+++ /dev/null
@@ -1 +0,0 @@
-fd63:1e39:6f73:303:ff84:0:103:343
diff --git a/scripts/check_db_safety b/scripts/check_db_safety
index a33bad32e90172fdbd37f0897668822ea8528761..
index ..d5e950bfbf0b9a9637dcf66e943d4d15905217ce 100755
--- a/scripts/check_db_safety
+++ b/scripts/check_db_safety
@@ -15,6 +15,7 @@ for tld in db/dom/* ; do
    domain="$(basename $dom).$(basename $tld)"
    echo "There's a bad nameserver under $domain." >&2
    echo "You probably don't want to run any shell scripts." >&2
+   exit 1
   fi
   for ns in $dom/ns/* ; do
    if [ "$(cat $ns | tr -d '0-9.\n' | wc -c | tr -d ' \t')" != 0 ]; then
@@ -23,6 +24,7 @@ for tld in db/dom/* ; do
     echo "There's a bad nameserver IP under $domain, for" >&2
     echo " $nsname" >&2
     echo "You probably don't want to run any shell scripts." >&2
+    exit 1
    fi
   done
  done
@@ -46,6 +48,7 @@ if [ "$(ls db/ip/ | tr -d 'A-F0-9\n' | wc -c | tr -d ' \t')" != 0 ]; then
       ip="$(basename $first).$(basename $second).$(basename $third).0/24"
       echo "There's a bad nameserver under $ip." >&2
       echo "You probably don't want to run any shell scripts." >&2
+      exit 1
      fi
      for ns in $third/ns/* ; do
       if [ "$(cat $ns | tr -d '0-9.\n' | wc -c | tr -d ' \t')" != 0 ]; then
@@ -54,6 +57,7 @@ if [ "$(ls db/ip/ | tr -d 'A-F0-9\n' | wc -c | tr -d ' \t')" != 0 ]; then
        echo "There's a bad nameserver IP under $ip, for" >&2
        echo " $nsname" >&2
        echo "You probably don't want to run any shell scripts." >&2
+       exit 1
       fi
      done
     done

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