From: Roland Mas <lolando@debian.org>
Date: Mon, 5 Sep 2011 09:28:45 +0000 (+0000)
Subject: Merged from 5.1: Added missing safeguard
X-Git-Tag: v5_2_rc1~857
X-Git-Url: https://scm.fusionforge.org/anonscm/gitweb?p=fusionforge%2Ffusionforge.git;a=commitdiff_plain;h=647a79e59dfbd6bb9a4fb9e83fefb4286c4f4375

Merged from 5.1: Added missing safeguard
---

diff --git a/src/deb-specific/install-postfix.sh b/src/deb-specific/install-postfix.sh
index 393bf070e8..45b7811f0b 100755
--- a/src/deb-specific/install-postfix.sh
+++ b/src/deb-specific/install-postfix.sh
@@ -48,7 +48,11 @@ while ($l = <>) {
   print $l;
 };
 chomp $l;
-$l .= ", users.$domain_name" unless ($l =~ /^[^#]*users.$domain_name/);
+if ($l =~ /^(\s*mydestination\s*=\s*)(\S.*)/) {
+  $l .= ", users.$domain_name" unless ($l =~ /users.$domain_name/);
+} else {
+  $l = "mydestination = users.$domain_name"
+}
 print "$l\n";
 while ($l = <>) { print $l; };
 ' < /etc/postfix/main.cf.gforge-new > $tmp1