diff options
| author | Antoine Ginies <aginies@mandriva.com> | 2004-12-10 14:22:57 +0000 |
|---|---|---|
| committer | Antoine Ginies <aginies@mandriva.com> | 2004-12-10 14:22:57 +0000 |
| commit | 8ba9e581ab914bcf54e075a21ecef89805c68036 (patch) | |
| tree | 94ebd6d2d94dd14414676ff1cdbdf71bf8f514d2 | |
| parent | a6baeb7f6495587f7d8ddf2d34ecb8284eceebdb (diff) | |
| download | drakwizard-8ba9e581ab914bcf54e075a21ecef89805c68036.tar drakwizard-8ba9e581ab914bcf54e075a21ecef89805c68036.tar.gz drakwizard-8ba9e581ab914bcf54e075a21ecef89805c68036.tar.bz2 drakwizard-8ba9e581ab914bcf54e075a21ecef89805c68036.tar.xz drakwizard-8ba9e581ab914bcf54e075a21ecef89805c68036.zip | |
use test_host_domain
| -rwxr-xr-x | kolab_wizard/Kolab.pm | 5 | ||||
| -rwxr-xr-x | samba_wizard/Samba.pm | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/kolab_wizard/Kolab.pm b/kolab_wizard/Kolab.pm index 0ecec1f0..cccbd539 100755 --- a/kolab_wizard/Kolab.pm +++ b/kolab_wizard/Kolab.pm @@ -39,10 +39,7 @@ my $DOMAINNAME = chomp_(`dnsdomainname`); my $o = { name => N("Kolab configuration wizard"), init => sub { - 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 + test_host_domain($HOSTNAME, $DOMAINNAME); }, var => { HOSTNAME => $HOSTNAME, diff --git a/samba_wizard/Samba.pm b/samba_wizard/Samba.pm index 6e05cc0e..581df5bd 100755 --- a/samba_wizard/Samba.pm +++ b/samba_wizard/Samba.pm @@ -30,6 +30,9 @@ use MDK::Wizard::Wizcommon; my $wiz = new MDK::Wizard::Wizcommon; my $old; +my $DOMAINNAME = chomp_(`dnsdomainname`); +my $SHORTHOSTNAME = chomp_(`hostname -s`); + my $o = { name => N("Samba wizard"), @@ -59,6 +62,7 @@ my $o = { } else { return 0, N("%s does not exist.", $file) } + test_host_domain($SHORTHOSTNAME, $DOMAINNAME); } }; |