summaryrefslogtreecommitdiffstats
path: root/postfix_wizard
diff options
context:
space:
mode:
authorAntoine Ginies <aginies@mandriva.com>2004-03-11 09:34:04 +0000
committerAntoine Ginies <aginies@mandriva.com>2004-03-11 09:34:04 +0000
commitbc851754e0dfc9101de53224ffcc2cce2a7a64ca (patch)
treee42f0f318fa75e68d1e9941e4bf8771042486864 /postfix_wizard
parentc38fe6fffe8b66e2e013068ad49538cb4e94a0b2 (diff)
downloaddrakwizard-bc851754e0dfc9101de53224ffcc2cce2a7a64ca.tar
drakwizard-bc851754e0dfc9101de53224ffcc2cce2a7a64ca.tar.gz
drakwizard-bc851754e0dfc9101de53224ffcc2cce2a7a64ca.tar.bz2
drakwizard-bc851754e0dfc9101de53224ffcc2cce2a7a64ca.tar.xz
drakwizard-bc851754e0dfc9101de53224ffcc2cce2a7a64ca.zip
fix pb of cannonical file
Diffstat (limited to 'postfix_wizard')
-rwxr-xr-xpostfix_wizard/Postfix.pm31
1 files changed, 16 insertions, 15 deletions
diff --git a/postfix_wizard/Postfix.pm b/postfix_wizard/Postfix.pm
index a324f16f..e1f5c950 100755
--- a/postfix_wizard/Postfix.pm
+++ b/postfix_wizard/Postfix.pm
@@ -91,7 +91,7 @@ $o->{pages} = {
}
},
data => [
- { label => N("Masquerade domain name:"), val => \$o->{var}{wiz_mail_masquerade} },
+ { label => N("Masquerade domain name:"), val => \$o->{var}{wiz_mail_masquerade} },
],
next => 'isp',
},
@@ -112,7 +112,7 @@ $o->{pages} = {
},
post => \&check_relay,
data => [
- { label => N("Mail server name:"), val => \$o->{var}{wiz_ext_mail_relay} },
+ { label => N("Mail server name:"), val => \$o->{var}{wiz_ext_mail_relay} },
],
next => 'originext',
},
@@ -276,19 +276,20 @@ sub do_it_external {
foreach (@conf) {
system("/usr/sbin/postconf -e '$_'");
}
- 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;
- foreach (cat_($file)) {
- if (/^\s*(?!#)\s*\@$wiz_domain_name/) {
- $t = $_;
- last;
- }
- }
- if ($t) { substInFile { s|$t|| } }
- else { append_to_file($file, $canon) }
- }
+
+# if (defined $o->{var}{wiz_ext_mail_relay}) {
+# my $file = "/etc/postfix/canonical";
+# my $canon = "\n\@$wiz_domain_name";
+# my $t;
+# foreach (cat_($file)) {
+# if (/^\s*(?!#)\s*\@$wiz_domain_name/) {
+# $t = $_;
+# last;
+# }
+# }
+# if ($t) { substInFile { s|$t|| } }
+# else { append_to_file($file, $canon) }
+# }
cmd_needed();
undef $w;
check_started('master');