summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Ginies <aginies@mandriva.com>2005-08-29 08:19:27 +0000
committerAntoine Ginies <aginies@mandriva.com>2005-08-29 08:19:27 +0000
commit10b1281189ed9af17c639cef7ed0cdfff68c90c0 (patch)
treef16822e389af99efdffd7bde90f8f8439af64ed9
parente18c90f2a21345da5a2da409d495017d23632add (diff)
downloaddrakwizard-10b1281189ed9af17c639cef7ed0cdfff68c90c0.tar
drakwizard-10b1281189ed9af17c639cef7ed0cdfff68c90c0.tar.gz
drakwizard-10b1281189ed9af17c639cef7ed0cdfff68c90c0.tar.bz2
drakwizard-10b1281189ed9af17c639cef7ed0cdfff68c90c0.tar.xz
drakwizard-10b1281189ed9af17c639cef7ed0cdfff68c90c0.zip
fix masquerade domains (thx camille report)
-rwxr-xr-xpostfix_wizard/Postfix.pm8
1 files changed, 4 insertions, 4 deletions
diff --git a/postfix_wizard/Postfix.pm b/postfix_wizard/Postfix.pm
index ec9e8cd1..7ae4a296 100755
--- a/postfix_wizard/Postfix.pm
+++ b/postfix_wizard/Postfix.pm
@@ -105,8 +105,8 @@ my %type = (
);
my %understanding = (
- 1 => N('Newbie - classical options'),
- 2 => N('Expert - advanced options'),
+ 1 => N("Newbie - classical options"),
+ 2 => N("Expert - advanced options"),
);
my @yesorno = qw(yes no); push @yesorno, "";
@@ -181,8 +181,8 @@ $o->{pages} = {
{ label => N('Masquerade domains'), val => \$o->{var}{wiz_masquerade_domains}, help => N('This should be chosen consistently with the address you use for incoming mail. Address masquerading is a method to hide all hosts inside a domain behind their mail gateway, and to make it appear as if the mail comes from the gateway itself, instead of from individual machines.') },
],
complete => sub {
- if ($o->{var}{wiz_masquerade_domains} !~ /\w+\.\w+$/ and $o->{var}{wiz_masquerade_domains}) {
- $::in->ask_warn(N("Error"), N("Masquerade should be a valid domain name such as \"mydomain.com\"!"));
+ if ($o->{var}{wiz_masquerade_domains} !~ /\w+\.\w+\s\w+\.\w+$/ and $o->{var}{wiz_masquerade_domains}) {
+ $::in->ask_warn(N("Error"), N("Masquerade should be a valid domain name such as \"domain_to_masquerade.com with_this_domain.com\"!"));
return 1;
} else { return 0; };
},