diff options
| author | Derek Jennings <djennings@mageia.org> | 2013-08-31 22:13:01 +0100 |
|---|---|---|
| committer | Derek Jennings <djennings@mageia.org> | 2013-08-31 22:13:01 +0100 |
| commit | 8274752db10100ee224d08d935de582ea04ce744 (patch) | |
| tree | 54ee2961a18c502475a84f2c1613e1f965c212a4 | |
| parent | 3b385651fc16abd731e476ff71b571deaf31c2c1 (diff) | |
| download | drakwizard-8274752db10100ee224d08d935de582ea04ce744.tar drakwizard-8274752db10100ee224d08d935de582ea04ce744.tar.gz drakwizard-8274752db10100ee224d08d935de582ea04ce744.tar.bz2 drakwizard-8274752db10100ee224d08d935de582ea04ce744.tar.xz drakwizard-8274752db10100ee224d08d935de582ea04ce744.zip | |
fix detection of invalid domain names
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | common/Wizcommon.pm | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -1,3 +1,5 @@ +- fix detection of invalid domain names + Version 3.9.1 - 29 Aug 2013, by djennings - copy bind templates if not present (mga#10981) diff --git a/common/Wizcommon.pm b/common/Wizcommon.pm index 34a94f48..f09341f8 100644 --- a/common/Wizcommon.pm +++ b/common/Wizcommon.pm @@ -72,7 +72,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; |