From 2ec3d73a715b02e6373967048a2ee5247818aa2c Mon Sep 17 00:00:00 2001
From: Arnaud Desmons <adesmons@mandriva.com>
Date: Fri, 30 Aug 2002 08:13:04 +0000
Subject: canonical bug

---
 postfix_wizard/scripts/Postfixconf.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'postfix_wizard/scripts/Postfixconf.pm')

diff --git a/postfix_wizard/scripts/Postfixconf.pm b/postfix_wizard/scripts/Postfixconf.pm
index ccb99468..dfaf1f47 100644
--- a/postfix_wizard/scripts/Postfixconf.pm
+++ b/postfix_wizard/scripts/Postfixconf.pm
@@ -53,7 +53,7 @@ sub	do_it {
     }
     if (defined $ENV{wiz_ext_mail_relay}) {
 	my $file = "/etc/postfix/canonical";
-	my $canon = "\n\@$wiz_domain_name \@$ENV{wiz_mail_masquerade}";
+	my $canon = "\n\@$wiz_domain_name $ENV{wiz_mail_masquerade}";
 	my $t;
 	foreach (cat_($file)) {
 	    if (/^\s*(?!\#)\s*\@.*\@.*\@.*/) {
@@ -62,7 +62,7 @@ sub	do_it {
 	    }
 	}
 	if ($t) { substInFile { s|$t|\#$&$canon|} $file } 
-	else { append_to_file($canon) }
+	else { append_to_file($file, $canon) }
     }
     system("postmap /etc/postfix/canonical");
     system("postmap /etc/postfix/virtual");
-- 
cgit v1.2.1