From 929e8501b67e87374dea6731fb270c2829fb56c5 Mon Sep 17 00:00:00 2001
From: Antoine Ginies <aginies@mandriva.com>
Date: Tue, 9 Mar 2004 12:41:12 +0000
Subject: cant access add/remove hosts if host is a DNS slave

---
 dns_wizard/Bind.pm | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'dns_wizard')

diff --git a/dns_wizard/Bind.pm b/dns_wizard/Bind.pm
index 9d5a3ad1..b06be23a 100644
--- a/dns_wizard/Bind.pm
+++ b/dns_wizard/Bind.pm
@@ -53,7 +53,7 @@ my $TEXTINFO = "dns Wizard";
 my $REP_SAVE = "/tmp/bck";
 my $ZONE_DIR = $NAMED_DIR . "/zone";
 my $DATE = `date +%d-%m-20%y`;
-#my $ft = "/var/named/master_srv";
+my $ft = "/etc/sysconfig/wizard_dns";
 
 
 my $o = { 
@@ -109,12 +109,13 @@ $o->{pages} = {
 			     $o->{var}{wiz_level} ||= 1;
 			   },
 			   post => sub {
-#			     -f $ft or return 'error_notmaster';
 			     if ($o->{var}{wiz_level} == 2) {
 			       return 'slave' }
-			     elsif ($o->{var}{wiz_level} == 3) {
+			     elsif ($o->{var}{wiz_level} == 1) {
+			       return 'ipforward' }
+			     elsif ($o->{var}{wiz_level} == 3 && -f $ft or return 'error_notmaster') {
 			       return 'addhost' }
-			     elsif ($o->{var}{wiz_level} == 4) {
+			     elsif ($o->{var}{wiz_level} == 4 && -f $ft or return 'error_notmaster') {
 			       return 'removehost' }
 			   },
 			   data => [
@@ -689,7 +690,7 @@ sub do_it_master {
   return if $::testing;
   my $in = 'interactive'->vnew('su', 'dns');
   my $w = $in->wait_message(N("Master DNS server"), N("Configuring your system as Master DNS server ..."));
-#  system("touch $ft");
+  system("touch $ft");
   do_it();
   crea_iprev($IPSERVER, $DOMAINNAME);
   crea_ipnorm($IPSERVER, $DOMAINNAME);
@@ -703,6 +704,7 @@ sub do_it_slave {
   return if $::testing;
   my $in = 'interactive'->vnew('su', 'dns');
   my $w = $in->wait_message(N("Slave DNS server"), N("Configuring your system as Slave DNS server ..."));
+  if (-f $ft) { unlink $ft }
   do_it();
   rm_rf(glob("$NAMED_DIR/bak*"));
   crea_named_slave($IPSERVER, $DOMAINNAME, $o->{var}{IPMASTER});
-- 
cgit v1.2.1