Tell postfix to pass original_recipient to dovecot (required to extract envelope :detail)

qroac · qroac · commit 8ef8a7d211f5 · 2018-01-08T14:50:16.000+01:00
diff --git a/install/dist/lib/debian60.lib.php b/install/dist/lib/debian60.lib.php
@@ -61,7 +61,7 @@ public function configure_dovecot()
 			}
 			//* Configure master.cf and add a line for deliver
 			$content = rf($conf["postfix"]["config_dir"].'/master.cf');
-			$deliver_content = 'dovecot   unix  -       n       n       -       -       pipe'."\n".'  flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop}'."\n";
+			$deliver_content = 'dovecot   unix  -       n       n       -       -       pipe'."\n".'  flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop} -a ${original_recipient}'."\n";
 			af($config_dir.'/master.cf', $deliver_content);
 			unset($content);
 			unset($deliver_content);
diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php
@@ -394,7 +394,7 @@ public function configure_dovecot()
 			}
 			//* Configure master.cf and add a line for deliver
 			$content = rf($conf["postfix"]["config_dir"].'/master.cf');
-			$deliver_content = 'dovecot   unix  -       n       n       -       -       pipe'."\n".'  flags=DRhu user=vmail:vmail argv=/usr/libexec/dovecot/deliver -f ${sender} -d ${user}@${nexthop}'."\n";
+			$deliver_content = 'dovecot   unix  -       n       n       -       -       pipe'."\n".'  flags=DRhu user=vmail:vmail argv=/usr/libexec/dovecot/deliver -f ${sender} -d ${user}@${nexthop} -a ${original_recipient}'."\n";
 			af($conf["postfix"]["config_dir"].'/master.cf', $deliver_content);
 			unset($content);
 			unset($deliver_content);
diff --git a/install/dist/lib/gentoo.lib.php b/install/dist/lib/gentoo.lib.php
@@ -303,7 +303,7 @@ public function configure_dovecot()
 			}
 			//* Configure master.cf and add a line for deliver
 			$content = rf($conf["postfix"]["config_dir"].'/master.cf');
-			$deliver_content = 'dovecot   unix  -       n       n       -       -       pipe'."\n".'  flags=DROhu user=vmail:vmail argv=/usr/libexec/dovecot/deliver -f ${sender} -d ${user}@${nexthop}'."\n";
+			$deliver_content = 'dovecot   unix  -       n       n       -       -       pipe'."\n".'  flags=DROhu user=vmail:vmail argv=/usr/libexec/dovecot/deliver -f ${sender} -d ${user}@${nexthop} -a ${original_recipient}'."\n";
 			af($config_dir.'/master.cf', $deliver_content);
 			unset($content);
 			unset($deliver_content);
diff --git a/install/dist/lib/opensuse.lib.php b/install/dist/lib/opensuse.lib.php
@@ -404,7 +404,7 @@ public function configure_dovecot()
 			}
 			//* Configure master.cf and add a line for deliver
 			$content = rf($conf["postfix"]["config_dir"].'/master.cf');
-			$deliver_content = 'dovecot   unix  -       n       n       -       -       pipe'."\n".'  flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop}'."\n";
+			$deliver_content = 'dovecot   unix  -       n       n       -       -       pipe'."\n".'  flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop} -a ${original_recipient}'."\n";
 			af($conf["postfix"]["config_dir"].'/master.cf', $deliver_content);
 			unset($content);
 			unset($deliver_content);
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
@@ -1322,7 +1322,7 @@ public function configure_dovecot() {
 			}
 			//* Configure master.cf and add a line for deliver
 			$content = rf($conf["postfix"]["config_dir"].'/master.cf');
-			$deliver_content = 'dovecot   unix  -       n       n       -       -       pipe'."\n".'  flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop}'."\n";
+			$deliver_content = 'dovecot   unix  -       n       n       -       -       pipe'."\n".'  flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop} -a ${original_recipient}'."\n";
 			af($config_dir.'/master.cf', $deliver_content);
 			unset($content);
 			unset($deliver_content);

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public function configure_dovecot()`
`61`	`61`	`}`
`62`	`62`	`//* Configure master.cf and add a line for deliver`
`63`	`63`	`$content = rf($conf["postfix"]["config_dir"].'/master.cf');`
`64`		`- $deliver_content = 'dovecot unix - n n - - pipe'."\n".' flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop}'."\n";`
	`64`	`+ $deliver_content = 'dovecot unix - n n - - pipe'."\n".' flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop} -a ${original_recipient}'."\n";`
`65`	`65`	`af($config_dir.'/master.cf', $deliver_content);`
`66`	`66`	`unset($content);`
`67`	`67`	`unset($deliver_content);`
Original file line number	Diff line number	Diff line change
`@@ -394,7 +394,7 @@ public function configure_dovecot()`
`394`	`394`	`}`
`395`	`395`	`//* Configure master.cf and add a line for deliver`
`396`	`396`	`$content = rf($conf["postfix"]["config_dir"].'/master.cf');`
`397`		`- $deliver_content = 'dovecot unix - n n - - pipe'."\n".' flags=DRhu user=vmail:vmail argv=/usr/libexec/dovecot/deliver -f ${sender} -d ${user}@${nexthop}'."\n";`
	`397`	`+ $deliver_content = 'dovecot unix - n n - - pipe'."\n".' flags=DRhu user=vmail:vmail argv=/usr/libexec/dovecot/deliver -f ${sender} -d ${user}@${nexthop} -a ${original_recipient}'."\n";`
`398`	`398`	`af($conf["postfix"]["config_dir"].'/master.cf', $deliver_content);`
`399`	`399`	`unset($content);`
`400`	`400`	`unset($deliver_content);`
Original file line number	Diff line number	Diff line change
`@@ -303,7 +303,7 @@ public function configure_dovecot()`
`303`	`303`	`}`
`304`	`304`	`//* Configure master.cf and add a line for deliver`
`305`	`305`	`$content = rf($conf["postfix"]["config_dir"].'/master.cf');`
`306`		`- $deliver_content = 'dovecot unix - n n - - pipe'."\n".' flags=DROhu user=vmail:vmail argv=/usr/libexec/dovecot/deliver -f ${sender} -d ${user}@${nexthop}'."\n";`
	`306`	`+ $deliver_content = 'dovecot unix - n n - - pipe'."\n".' flags=DROhu user=vmail:vmail argv=/usr/libexec/dovecot/deliver -f ${sender} -d ${user}@${nexthop} -a ${original_recipient}'."\n";`
`307`	`307`	`af($config_dir.'/master.cf', $deliver_content);`
`308`	`308`	`unset($content);`
`309`	`309`	`unset($deliver_content);`
Original file line number	Diff line number	Diff line change
`@@ -404,7 +404,7 @@ public function configure_dovecot()`
`404`	`404`	`}`
`405`	`405`	`//* Configure master.cf and add a line for deliver`
`406`	`406`	`$content = rf($conf["postfix"]["config_dir"].'/master.cf');`
`407`		`- $deliver_content = 'dovecot unix - n n - - pipe'."\n".' flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop}'."\n";`
	`407`	`+ $deliver_content = 'dovecot unix - n n - - pipe'."\n".' flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop} -a ${original_recipient}'."\n";`
`408`	`408`	`af($conf["postfix"]["config_dir"].'/master.cf', $deliver_content);`
`409`	`409`	`unset($content);`
`410`	`410`	`unset($deliver_content);`
Original file line number	Diff line number	Diff line change
`@@ -1322,7 +1322,7 @@ public function configure_dovecot() {`
`1322`	`1322`	`}`
`1323`	`1323`	`//* Configure master.cf and add a line for deliver`
`1324`	`1324`	`$content = rf($conf["postfix"]["config_dir"].'/master.cf');`
`1325`		`- $deliver_content = 'dovecot unix - n n - - pipe'."\n".' flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop}'."\n";`
	`1325`	`+ $deliver_content = 'dovecot unix - n n - - pipe'."\n".' flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop} -a ${original_recipient}'."\n";`
`1326`	`1326`	`af($config_dir.'/master.cf', $deliver_content);`
`1327`	`1327`	`unset($content);`
`1328`	`1328`	`unset($deliver_content);`