summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDerek Jennings <djennings@mageia.org>2013-08-31 00:39:26 +0100
committerDerek Jennings <djennings@mageia.org>2013-08-31 00:39:26 +0100
commitcac4170301665b659a77dae8376400169bad58b0 (patch)
tree159e8173e24a961a1dae2077969c57d16cb8b65c
parentf9496fb487045de1de6422f0dcc04c025728501e (diff)
downloaddrakwizard-cac4170301665b659a77dae8376400169bad58b0.tar
drakwizard-cac4170301665b659a77dae8376400169bad58b0.tar.gz
drakwizard-cac4170301665b659a77dae8376400169bad58b0.tar.bz2
drakwizard-cac4170301665b659a77dae8376400169bad58b0.tar.xz
drakwizard-cac4170301665b659a77dae8376400169bad58b0.zip
fix detection of invalid domain names
-rw-r--r--NEWS1
-rw-r--r--common/Wizcommon.pm2
2 files changed, 2 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index aff78871..8d560b58 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,4 @@
+- fix detection of invalid domain names
- create directory if bind has not
Version 3.7.6 - 27 August 2013, by djennings
diff --git a/common/Wizcommon.pm b/common/Wizcommon.pm
index 2fe045d0..fd9c7d54 100644
--- a/common/Wizcommon.pm
+++ b/common/Wizcommon.pm
@@ -75,7 +75,7 @@ sub test_host_domain {
if ($SHORTHOSTNAME =~ /localhost/) {
return 0, N("You need to readjust your hostname. 'localhost' is not a correct hostname for a DNS server. Hostname must be a FQDN: Fully Qualified Domain Name");
}
- if (member($DOMAINNAME, qw(localdomain (none))) && -z $DOMAINNAME) {
+ if (member($DOMAINNAME, qw(localdomain (none))) || $DOMAINNAME eq '') {
return 0, N("You need to readjust your domainname. For a DNS server you need a correct domainname, not equal to localdomain or none. Hostname must be a FQDN: Fully Qualified Domain Name. Launch drakconnect to adjust it.");
}
return 1;