Bug#290954: return_path macro generates invalid syntax

[Andreas Metzler]

--M9NhX3UHpAaciwkO
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

tags 290956 patch pending
thanks
On 2005-01-17 "Adam D. Barratt" <debian-bts@adam-barratt.org.uk> wrote:
> As noted on exim-users (the thread starting at
> http://www.exim.org/mail-archives/exim-users/Week-of-Mon-20050117/msg00036.html), the recent changes to return_path in update-exim4.conf lead to the generated configuration file failing to parse.

> This is due to a set of missing braces around the inner if
[...]

Thanks, I'll upload a fix soon.

For the meantime safe the attached file as /tmp/fix-up-ex4.conf and run

patch /usr/sbin/update-exim4.conf < /tmp/fix-up-ex4.conf
invoke-rc.d exim4 reload

          sorry, cu andreas
-- 
"See, I told you they'd listen to Reason," [SPOILER] Svfurlr fnlf,
fuhggvat qbja gur juveyvat tha.
Neal Stephenson in "Snow Crash"
                                           http://downhill.aus.cc/

--M9NhX3UHpAaciwkO
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="fix-up-ex4.conf"

--- /tmp/update-exim4.conf	2005-01-18 12:53:39.000000000 +0100
+++ /usr/sbin/update-exim4.conf	2005-01-18 12:54:34.000000000 +0100
@@ -252,7 +252,7 @@
 	satellite|smarthost)
 	if [ "${dc_hide_mailname}" = "true" ] && [ -n "${dc_readhost}" ] ; then
 		DEBCONFheaders_rewriteDEBCONF='headers_rewrite = *@+local_domains $1@DCreadhost frs : *@'"$mailname"' $1@DCreadhost frs'
-		DEBCONFreturn_pathDEBCONF='return_path = ${if match_domain{$sender_address_domain}{+local_domains}{${sender_address_local_part}@DCreadhost}${if match_domain{$sender_address_domain}{'"$mailname"'}{${sender_address_local_part}@DCreadhost}fail}}'
+		DEBCONFreturn_pathDEBCONF='return_path = ${if match_domain{$sender_address_domain}{+local_domains}{${sender_address_local_part}@DCreadhost}{${if match_domain{$sender_address_domain}{'"$mailname"'}{${sender_address_local_part}@DCreadhost}fail}}}'
 	fi
 	;;
 	local)

--M9NhX3UHpAaciwkO--