From 31f34fba8022f2d8766641c84c5664b61631e127 Mon Sep 17 00:00:00 2001 From: Antoine Ginies Date: Thu, 29 Jul 2004 00:54:51 +0000 Subject: use dnsdomainname (thx jmdault) --- kolab_wizard/Kolab.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'kolab_wizard/Kolab.pm') diff --git a/kolab_wizard/Kolab.pm b/kolab_wizard/Kolab.pm index d4395dda..7fd82449 100755 --- a/kolab_wizard/Kolab.pm +++ b/kolab_wizard/Kolab.pm @@ -33,13 +33,13 @@ if (!$IPSERVER) { my $interface = 'eth0'; ($IPSERVER) = `/sbin/ip addr show dev $interface` =~ /^\s*inet\s+(\d+\.\d+\.\d+\.\d+)/m; } -my $DOMAINNAME = chomp_(`domainname`); +my $DOMAINNAME = chomp_(`dnsdomainname`); my $kolab_config = "/etc/kolab/kolab.conf"; my $o = { name => N("Kolab configuration wizard"), init => sub { - if (member($DOMAINNAME, qw(localdomain (none)))) { + if (($DOMAINNAME eq "") or ($HOSTNAME eq "localhost")) { return 0, N("You need to readjust your domainname, not equal to localdomain or none. Please launch drakconnect to adjust it.") } 1 -- cgit v1.2.1