From 5a73b73b3b69aeae488f2308817bf6e1b85a02dc Mon Sep 17 00:00:00 2001
From: Serghey Rodin <serghey.rodin@gmail.com>
Date: Tue, 26 Feb 2013 12:07:05 +0200
Subject: [PATCH] fix for broken unsuspend

---
 bin/v-rebuild-dns-domains  | 7 +++++--
 bin/v-unsuspend-dns-domain | 7 ++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/bin/v-rebuild-dns-domains b/bin/v-rebuild-dns-domains
index aaec4e9810..d2134fe509 100755
--- a/bin/v-rebuild-dns-domains
+++ b/bin/v-rebuild-dns-domains
@@ -56,6 +56,9 @@ for nameserver in ${ns//,/ };do
     i=$((i + 1))
 done
 
+# Remove old user's zone
+sed -i "/\/$user\/conf\/dns/d" /etc/named.conf
+
 # Starting loop
 for domain in $(search_objects 'dns' 'DOMAIN' "*" 'DOMAIN'); do
     # Defining variables
@@ -89,13 +92,13 @@ for domain in $(search_objects 'dns' 'DOMAIN' "*" 'DOMAIN'); do
     # Bind config check
     nconf='/etc/named.conf'
     if [ "$SUSPENDED" = 'yes' ]; then
-	rm_string=$(grep -n /etc/namedb/$domain.db $nconf | cut -d : -f 1)
+        rm_string=$(grep -n /etc/namedb/$domain.db $nconf | cut -d : -f 1)
         if [ ! -z "$rm_string" ]; then
             sed -i "$rm_string d" $nconf
         fi
         suspended_dns=$((suspended_dns + 1))
     else
-	if [ -z "$(grep /$domain.db $nconf)" ]; then
+        if [ -z "$(grep /$domain.db $nconf)" ]; then
             named="zone \"$domain_idn\" {type master; file"
             named="$named \"$HOMEDIR/$user/conf/dns/$domain.db\";};"
             echo "$named" >> /etc/named.conf
diff --git a/bin/v-unsuspend-dns-domain b/bin/v-unsuspend-dns-domain
index eb0cabf737..372d2d99ae 100755
--- a/bin/v-unsuspend-dns-domain
+++ b/bin/v-unsuspend-dns-domain
@@ -37,9 +37,10 @@ is_object_suspended 'dns' 'DOMAIN' "$domain"
 #----------------------------------------------------------#
 
 # Adding zone in named.conf
-named="zone \"$domain_idn\" {type master; file"
-named="$named \"$HOMEDIR/$user/conf/dns/$domain.db\";};"
-echo "$named" >> /etc/named.conf
+#named="zone \"$domain_idn\" {type master; file"
+#named="$named \"$HOMEDIR/$user/conf/dns/$domain.db\";};"
+#echo "$named" >> /etc/named.conf
+
 
 #----------------------------------------------------------#
 #                       Vesta                              #