summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xclient_wizard/Bind_client.pm4
-rw-r--r--dns_wizard/Bind.pm9
-rwxr-xr-xdrakwizard.pl1
-rw-r--r--drakwizard.spec8
-rwxr-xr-xftp_wizard/Proftpd.pm13
-rw-r--r--time_wizard/Ntp.pm4
6 files changed, 27 insertions, 12 deletions
diff --git a/client_wizard/Bind_client.pm b/client_wizard/Bind_client.pm
index b7d065a9..44b692e8 100755
--- a/client_wizard/Bind_client.pm
+++ b/client_wizard/Bind_client.pm
@@ -162,9 +162,11 @@ sub do_it {
my $dc = "$4" if $o->{var}{client_ip} =~ /(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})/;
my $file="/var/named/$wiz_domain_name.db";
+ my $client_name = $o->{var}{client_name};
+ $client_name =~ s/\.$wiz_domain_name$//;
MDK::Common::cp_af($file, $file.".orig");
open(NEW, ">> $file") or die "can not open $file";
- print NEW "\n$o->{var}{client_name} IN A $o->{var}{client_ip} ; $date\n\n";
+ print NEW "\n$client_name IN A $o->{var}{client_ip} ; $date\n\n";
close(NEW) or die "can not close $file";
up_serial($file);
diff --git a/dns_wizard/Bind.pm b/dns_wizard/Bind.pm
index 26d745fb..d931aa73 100644
--- a/dns_wizard/Bind.pm
+++ b/dns_wizard/Bind.pm
@@ -25,6 +25,7 @@ use lib qw(/usr/lib/libDrakX);
use strict;
use common;
+use services;
use MDK::Wizard::Wizcommon;
my $wiz = new MDK::Wizard::Wizcommon;
@@ -190,8 +191,12 @@ nb: $ds");
print NEW "domain $wiz_domain_name\n";
print NEW "nameserver $wiz_ip_server\n";
standalone::explanations("$file : domain: $wiz_domain_name nameserver: $wiz_ip_server");
- system("/sbin/chkconfig --level 235 named on");
- system("/etc/rc.d/init.d/named restart");
+ services::start_service_on_boot('named');
+ if (services::is_service_running('named')) {
+ services::restart('named')
+ } else {
+ services::start('named')
+ }
}
sub new {
diff --git a/drakwizard.pl b/drakwizard.pl
index 69f9220a..ad735e1b 100755
--- a/drakwizard.pl
+++ b/drakwizard.pl
@@ -136,7 +136,6 @@ sub check_rpm {
if (!$in->do_pkgs->is_installed($rpm)) {
if ($in->ask_okcancel("error", N("%s is not installed\nClick \"Next\" to install or \"Cancel\" to quit", c::from_utf8($rpm)))) {
$::testing and next;
- print "\nINSTALLING $rpm\n";
if (!$in->do_pkgs->install($rpm)) {
$::Wizard_finished = 1;
$in->ask_okcancel("error", N("installation failed"));
diff --git a/drakwizard.spec b/drakwizard.spec
index cce142b5..1a2911e4 100644
--- a/drakwizard.spec
+++ b/drakwizard.spec
@@ -1,5 +1,5 @@
%define name drakwizard
-%define version 2.5
+%define version 2.6
%define release 1mdk
Name: %{name}
@@ -51,6 +51,12 @@ rm -rf $RPM_BUILD_DIR/$RPM_PACKAGE_NAME
%{perl_vendorlib}/MDK/
%changelog
+* Wed Nov 05 2003 Warly <warly@mandrakesoft.com> 2.6-1mdk
+- fix ntp wizard bad conf saving
+- fix dns_client wrong config for reverse name search
+- fix ntpd server wrong shut down at wizard first setup
+- fix anonymous mode for ftpwizard
+
* Fri Sep 19 2003 Warly <warly@mandrakesoft.com> 2.5-1mdk
- spell fixes
- update po
diff --git a/ftp_wizard/Proftpd.pm b/ftp_wizard/Proftpd.pm
index c4bb6b0c..764a9cc4 100755
--- a/ftp_wizard/Proftpd.pm
+++ b/ftp_wizard/Proftpd.pm
@@ -36,7 +36,7 @@ my $o = {
wiz_ftp_anon => '',
wiz_ftp_home => ''
},
- needed_rpm => [ 'proftpd' ],
+ needed_rpm => [ 'proftpd', 'proftpd-anonymous' ],
defaultimage => "$ENV{__WIZ_HOME__}ftp_wizard/images/FTP.png"
};
@@ -103,12 +103,12 @@ sub true {
$val eq "1" || $val eq "\'1\'" || $val eq "\"1\"" ||
$val eq "true" || $val eq "\'true\'" || $val eq "\"true\"" and
return 1;
- 0;
+ 0
}
sub check_dir {
-d $o->{var}{wiz_dir} and return 10;
- 1;
+ 1
}
sub get_dir {
@@ -123,13 +123,13 @@ sub get_dir {
}
}
}
- return "";
+ ""
}
sub check {
$> and return 'must_be_root';
$wiz->{net}->is_dhcp() and return 'warning_dhcp';
- '';
+ ''
}
sub print_anonymous() {
@@ -203,7 +203,8 @@ sub do_it {
Deny from all
</Limit>
</Global>
-#</drakwizard>';
+#</drakwizard>
+';
close NEW;
}
else { # the known section (3 parameters ) is replaced with our needs
diff --git a/time_wizard/Ntp.pm b/time_wizard/Ntp.pm
index dbc38909..0cf2cf9a 100644
--- a/time_wizard/Ntp.pm
+++ b/time_wizard/Ntp.pm
@@ -209,7 +209,9 @@ sub do_it {
standalone::explanations("Wrote /etc/ntp/step-tickers, starting services");
my @services = qw(crond atd ntpd);
foreach (@services) {
- services::stop($_)
+ if (services::is_service_running($_)) {
+ services::stop($_)
+ }
}
foreach (reverse @services) {
services::start($_)