# HG changeset patch
# User Nick <nick@somerandomnick.ano>
# Date 1287024086 0
# Node ID 91a0f3fd54b74be91d0e636e6367111cbb7f8fda
# Parent  b2de877ee4a90de1297f6413a70e99ea61253291# Parent  9d74bc7d704fabc387d41e58d7efff66101abc73
Merge git://pragmo.ano

diff -r b2de877ee4a9 -r 91a0f3fd54b7 scripts/nameserver_autogen/dnsmasq_tld_conffile
--- a/scripts/nameserver_autogen/dnsmasq_tld_conffile	Thu Oct 14 02:40:04 2010 +0000
+++ b/scripts/nameserver_autogen/dnsmasq_tld_conffile	Thu Oct 14 02:41:26 2010 +0000
@@ -8,9 +8,12 @@
 
 sh scripts/check_db_safety || exit 1
 
-for a in $(ls db/ip/); do
-	for b in $(ls db/ip/${a}); do
-		for c in $(ls db/ip/${a}/${b}); do
+
+LS="ls --color=never"
+
+for a in $($LS db/ip/); do
+	for b in $($LS db/ip/${a}); do
+		for c in $($LS db/ip/${a}/${b}); do
 			if [ -d db/ip/${a}/${b}/${c}/ns/ ]; then
 			 	for ns in $(cat db/ip/${a}/${b}/${c}/ns/*); do
 					A1=$(scripts/hex2dec ${a})
@@ -26,8 +29,8 @@
 
 echo
 
-for tld in $(ls db/dom/); do 
-	for domain in $(ls db/dom/${tld}/); do 
+for tld in $($LS db/dom/); do 
+	for domain in $($LS db/dom/${tld}/); do 
 		for ns in $(cat db/dom/${tld}/${domain}/ns/*); do 
 			STR="server=/${domain}.${tld}/${ns}"
 			echo $STR