repo: resdb
action: commit
revision: 
path_from: 
revision_from: bd8e74f9b38d7ca071ce16edadf393a624a77efe:
path_to: 
revision_to: 

commit bd8e74f9b38d7ca071ce16edadf393a624a77efe
Author: Nick 
Date:   Wed Jul 21 20:23:52 2010 +0000

    more OpenBSD fixes (again, thanks Quintum)

diff --git a/scripts/check_db_safety b/scripts/check_db_safety

--- a/scripts/check_db_safety
+++ b/scripts/check_db_safety
@@ -4,20 +4,20 @@ if [ "$(ls db/dom/ | tr -d 'a-z0-9\n-' | wc -c | tr -d ' \t')" != 0 ]; then
  exit 1
 fi
 for tld in db/dom/* ; do
- if [ "$(ls $tld/ | tr -d 'a-z0-9\n-' | wc -c)" != 0 ]; then
+ if [ "$(ls $tld/ | tr -d 'a-z0-9\n-' | wc -c | tr -d ' \t')" != 0 ]; then
   tld="$(basename $tld)"
   echo "There's a bad domain under $tld." >&2
   echo "You probably don't want to run any shell scripts." >&2
   exit 1
  fi
  for dom in $tld/* ; do
-  if [ "$(ls $dom/ns/ | tr -d 'a-z0-9\n.-' | wc -c)" != 0 ]; then
+  if [ "$(ls $dom/ns/ | tr -d 'a-z0-9\n.-' | wc -c | tr -d ' \t')" != 0 ]; then
    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
   fi
   for ns in $dom/ns/* ; do
-   if [ "$(cat $ns | tr -d '0-9.\n' | wc -c)" != 0 ]; then
+   if [ "$(cat $ns | tr -d '0-9.\n' | wc -c | tr -d ' \t')" != 0 ]; then
     domain="$(basename $dom).$(basename $tld)"
     nsname="$(basename $ns)"
     echo "There's a bad nameserver IP under $domain, for" >&2
@@ -27,28 +27,28 @@ for tld in db/dom/* ; do
   done
  done
 done
-if [ "$(ls db/ip/ | tr -d 'A-F0-9\n' | wc -c)" != 0 ]; then
+if [ "$(ls db/ip/ | tr -d 'A-F0-9\n' | wc -c | tr -d ' \t')" != 0 ]; then
  echo "There's a bad first octet.  You probably don't want to run any shell scripts." >&2
  exit 1
  for first in db/ip/* ; do
-  if [ "$(ls $first/ | tr -d 'A-F0-9\n' | wc -c)" != 0 ]; then
+  if [ "$(ls $first/ | tr -d 'A-F0-9\n' | wc -c | tr -d ' \t')" != 0 ]; then
    echo "There's a bad second octet under $first." >&2
    echo "You probably don't want to run any shell scripts." >&2
    exit 1
    for second in $first/* ; do
-    if [ "$(ls $second/ | tr -d 'A-F0-9\n' | wc -c)" != 0 ]; then
+    if [ "$(ls $second/ | tr -d 'A-F0-9\n' | wc -c | tr -d ' \t')" != 0 ]; then
      echo "There's a bad third octet under $second." >&2
      echo "You probably don't want to run any shell scripts." >&2
      exit 1
     fi
     for third in $second/* ; do
-     if [ "$(ls $third/ns/ | tr -d 'a-z0-9\n.-' | wc -c)" != 0 ]; then
+     if [ "$(ls $third/ns/ | tr -d 'a-z0-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
      fi
      for ns in $third/ns/* ; do
-      if [ "$(cat $ns | tr -d '0-9.\n' | wc -c)" != 0 ]; then
+      if [ "$(cat $ns | tr -d '0-9.\n' | wc -c | tr -d ' \t')" != 0 ]; then
        ip="$(basename $first).$(basename $second).$(basename $third).0/24"
        nsname="$(basename $ns)"
        echo "There's a bad nameserver IP under $ip, for" >&2

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