summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Vigier <nvigier@mandriva.com>2008-02-19 14:01:45 +0000
committerNicolas Vigier <nvigier@mandriva.com>2008-02-19 14:01:45 +0000
commit91208328821a6050ce7d6f316470b33c9a5ae401 (patch)
tree0bc051b32090c8bc37e11d83d380f0a24c600c58
parent6cbb36b56d99fcee921a2fd35609bf425758a25c (diff)
downloaddrakwizard-91208328821a6050ce7d6f316470b33c9a5ae401.tar
drakwizard-91208328821a6050ce7d6f316470b33c9a5ae401.tar.gz
drakwizard-91208328821a6050ce7d6f316470b33c9a5ae401.tar.bz2
drakwizard-91208328821a6050ce7d6f316470b33c9a5ae401.tar.xz
drakwizard-91208328821a6050ce7d6f316470b33c9a5ae401.zip
fix bug #36616
-rw-r--r--dns_wizard/Bind.pm6
-rwxr-xr-xkolab_wizard/Kolab.pm6
-rw-r--r--ldap_wizard/Ldap.pm6
-rw-r--r--nisautofs_wizard/Nisautofs.pm6
-rwxr-xr-xproxy_wizard/Squid.pm6
-rwxr-xr-xsamba_wizard/Samba.pm6
-rwxr-xr-xsshd_wizard/Sshd.pm6
7 files changed, 35 insertions, 7 deletions
diff --git a/dns_wizard/Bind.pm b/dns_wizard/Bind.pm
index 66e15102..c8c5ecd4 100644
--- a/dns_wizard/Bind.pm
+++ b/dns_wizard/Bind.pm
@@ -67,7 +67,11 @@ my $o = {
CLIENTIP => $CLIENTIP,
},
init => sub {
- test_host_domain($SHORTHOSTNAME, $DOMAINNAME);
+ my ($err, $msg) = test_host_domain($SHORTHOSTNAME, $DOMAINNAME);
+ if (!$err) {
+ $in->ask_warn(N('Error'), $msg);
+ die 'wizcancel';
+ }
},
needed_rpm => [ 'bind' ],
defaultimage => "/usr/share/mcc/themes/default/dns_server-mdk.png",
diff --git a/kolab_wizard/Kolab.pm b/kolab_wizard/Kolab.pm
index 9d6521e4..d07b13b7 100755
--- a/kolab_wizard/Kolab.pm
+++ b/kolab_wizard/Kolab.pm
@@ -41,7 +41,11 @@ my $CAYESORNO;
my $o = {
name => N("Kolab configuration wizard"),
init => sub {
- test_host_domain($HOSTNAME, $DOMAINNAME);
+ my ($err, $msg) = test_host_domain($SHORTHOSTNAME, $DOMAINNAME);
+ if (!$err) {
+ $in->ask_warn(N('Error'), $msg);
+ die 'wizcancel';
+ }
},
var => {
hostname => $HOSTNAME,
diff --git a/ldap_wizard/Ldap.pm b/ldap_wizard/Ldap.pm
index 4de8fb27..19d2031b 100644
--- a/ldap_wizard/Ldap.pm
+++ b/ldap_wizard/Ldap.pm
@@ -58,7 +58,11 @@ my $o = {
needed_rpm => [ 'openldap-servers', 'openldap-clients', 'nss_ldap' ],
defaultimage => "/usr/share/mcc/themes/default/ldap-mdk.png",
init => sub {
- test_host_domain($wiz_host_name, $DOMAINNAME);
+ my ($err, $msg) = test_host_domain($SHORTHOSTNAME, $DOMAINNAME);
+ if (!$err) {
+ $in->ask_warn(N('Error'), $msg);
+ die 'wizcancel';
+ }
}
};
diff --git a/nisautofs_wizard/Nisautofs.pm b/nisautofs_wizard/Nisautofs.pm
index 39742e7e..771dde4a 100644
--- a/nisautofs_wizard/Nisautofs.pm
+++ b/nisautofs_wizard/Nisautofs.pm
@@ -62,7 +62,11 @@ my $o = {
needed_rpm => [ 'ypserv', 'ypbind', 'nfs-utils', 'yp-tools', 'nfs-utils-clients' ],
defaultimage => "/usr/share/mcc/themes/default/nisautofs.png",
init => sub {
- test_host_domain($HOST, $NISDOMAIN);
+ my ($err, $msg) = test_host_domain($SHORTHOSTNAME, $DOMAINNAME);
+ if (!$err) {
+ $in->ask_warn(N('Error'), $msg);
+ die 'wizcancel';
+ }
},
};
diff --git a/proxy_wizard/Squid.pm b/proxy_wizard/Squid.pm
index 7439f1c2..4a8e0dd6 100755
--- a/proxy_wizard/Squid.pm
+++ b/proxy_wizard/Squid.pm
@@ -61,7 +61,11 @@ my $o = {
wiz_squid_disk => ''
},
init => sub {
- test_host_domain($SHORTHOSTNAME, $DOMAINNAME);
+ my ($err, $msg) = test_host_domain($SHORTHOSTNAME, $DOMAINNAME);
+ if (!$err) {
+ $in->ask_warn(N('Error'), $msg);
+ die 'wizcancel';
+ }
},
needed_rpm => [ 'squid' ],
defaultimage => "/usr/share/mcc/themes/default/drakproxy-mdk.png",
diff --git a/samba_wizard/Samba.pm b/samba_wizard/Samba.pm
index d057f9b1..d845812d 100755
--- a/samba_wizard/Samba.pm
+++ b/samba_wizard/Samba.pm
@@ -66,7 +66,11 @@ my $o = {
wiz_sambatype => '',
},
init => sub {
- test_host_domain($SHORTHOSTNAME, $DOMAINNAME);
+ my ($err, $msg) = test_host_domain($SHORTHOSTNAME, $DOMAINNAME);
+ if (!$err) {
+ $in->ask_warn(N('Error'), $msg);
+ die 'wizcancel';
+ }
},
needed_rpm => [ 'samba-server' ],
defaultimage => "/usr/share/wizards/samba_wizard/images/sambasrv.png",
diff --git a/sshd_wizard/Sshd.pm b/sshd_wizard/Sshd.pm
index d458823e..58657a91 100755
--- a/sshd_wizard/Sshd.pm
+++ b/sshd_wizard/Sshd.pm
@@ -47,7 +47,11 @@ my $o = {
wiz_port => '',
},
init => sub {
- test_host_domain($SHORTHOSTNAME, $DOMAINNAME);
+ my ($err, $msg) = test_host_domain($SHORTHOSTNAME, $DOMAINNAME);
+ if (!$err) {
+ $in->ask_warn(N('Error'), $msg);
+ die 'wizcancel';
+ }
},
needed_rpm => [ 'openssh-server' ],
defaultimage => "/usr/share/wizards/sshd_wizard/images/IC-Dssh-48.png",