summaryrefslogtreecommitdiffstats
path: root/postfix_wizard
diff options
context:
space:
mode:
authorAntoine Ginies <aginies@mandriva.com>2004-03-10 16:40:09 +0000
committerAntoine Ginies <aginies@mandriva.com>2004-03-10 16:40:09 +0000
commitf538d8f1d6eedf9e0e468be2eee6fa72ed613360 (patch)
tree8ff9c71a3f579e8840109d3b867e460e53051f11 /postfix_wizard
parent49b664e68c1b1724c39f8db2eb33f72b7cbefbee (diff)
downloaddrakwizard-f538d8f1d6eedf9e0e468be2eee6fa72ed613360.tar
drakwizard-f538d8f1d6eedf9e0e468be2eee6fa72ed613360.tar.gz
drakwizard-f538d8f1d6eedf9e0e468be2eee6fa72ed613360.tar.bz2
drakwizard-f538d8f1d6eedf9e0e468be2eee6fa72ed613360.tar.xz
drakwizard-f538d8f1d6eedf9e0e468be2eee6fa72ed613360.zip
fix cannonical configuration problem
Diffstat (limited to 'postfix_wizard')
-rwxr-xr-xpostfix_wizard/Postfix.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/postfix_wizard/Postfix.pm b/postfix_wizard/Postfix.pm
index d494ede8..a324f16f 100755
--- a/postfix_wizard/Postfix.pm
+++ b/postfix_wizard/Postfix.pm
@@ -168,7 +168,7 @@ sub new {
sub check_sendmail {
my $in = 'interactive'->vnew('su', 'Check sendmail');
- my $w = $in->wait_message(N("Postfix Server"), N("Check if sendmail is installed, to avoid conflict...."));
+ my $w = $in->wait_message(N("Postfix Server"), N("removing Sendmail to avoid conflict...."));
my $test = any { /sendmail/ } system("rpm -qa sendmail");
!$test or return 'error_sendmail';
undef $w;
@@ -276,7 +276,7 @@ sub do_it_external {
foreach (@conf) {
system("/usr/sbin/postconf -e '$_'");
}
- if (defined $o->{var}{wiz_ext_mail_relay}) {
+ if (defined $o->{var}{wiz_ext_mail_relay} && $wiz_domain_name ne $o->{var}{wiz_mail_masquerade}) {
my $file = "/etc/postfix/canonical";
my $canon = "\n\@$wiz_domain_name $o->{var}{wiz_mail_masquerade}";
my $t;