Bug#290956: exim4-config: patch for the reported bug

[Baldvin Kovacs]

This is a multi-part MIME message sent by reportbug.

--===============0967280341==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

Package: exim4-config
Version: 4.43-3
Followup-For: Bug #290956

I confirm that there is a problem. I created a patch that I beleive is
the solution. (I did not check the semantics well, but I beleive I have
corrected the syntax. It works for me at least :) )

Baldvin

-- Package-specific info:
Exim version 4.43 #1 built 16-Jan-2005 19:31:22
Copyright (c) University of Cambridge 2004
Berkeley DB: Sleepycat Software: Berkeley DB 3.2.9: (May 26, 2004)
Support for: iconv() IPv6 PAM Perl GnuTLS
Lookups: lsearch wildlsearch nwildlsearch iplsearch cdb dbm dbmnz dnsdb dsearch ldap ldapdn ldapm mysql nis nis0 passwd pgsql
Authenticators: cram_md5 plaintext spa
Routers: accept dnslookup ipliteral iplookup manualroute queryprogram redirect
Transports: appendfile/maildir/mailstore/mbx autoreply lmtp pipe smtp
Fixed never_users: 0
Contains exiscan-acl patch revision 28 (c) Tom Kistner [http://duncanthrax.net/exiscan/]
Configuration file is /var/lib/exim4/config.autogenerated
# /etc/exim4/update-exim4.conf.conf

dc_eximconfig_configtype='satellite'
dc_other_hostnames=''
dc_local_interfaces='127.0.0.1'
dc_readhost='cs.elte.hu'
dc_relay_domains=''
dc_minimaldns='false'
dc_relay_nets=''
dc_smarthost='mail.cs.elte.hu'
CFILEMODE='644'
dc_use_split_config='true'
dc_hide_mailname='true'
mailname:cs.elte.hu

-- System Information:
Debian Release: 3.1
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: i386 (i686)
Kernel: Linux 2.6.7-amd-nfs
Locale: LANG=hu_HU, LC_CTYPE=hu_HU (ignored: LC_ALL set to hu_HU)

Versions of packages exim4-config depends on:
ii  adduser                     3.59         Add and remove users and groups
ii  debconf [debconf-2.0]       1.4.38       Debian configuration management sy
ii  passwd                      1:4.0.3-30.1 Change and administer password and

-- debconf information:
  exim4/dc_smarthost:
  exim4/dc_relay_domains:
  exim4/exim3_upgrade: true
  exim4/dc_eximconfig_configtype: local delivery only; not on a network
  exim4/dc_readhost:
  exim4/exim4-config-title:
  exim4/dc_noalias_regenerate: false
  exim4/dc_relay_nets:
  exim4/mailname: cs.elte.hu
  exim4/dc_local_interfaces: 127.0.0.1
  exim4/dc_minimaldns: false
  exim4/dc_other_hostnames: cs.elte.hu
  exim4/no_config: true
  exim4/hide_mailname:
  exim4/dc_postmaster:
  exim4/use_split_config: false

--===============0967280341==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="exim4-4.43.patch"

diff -ur exim4-4.43.orig/debian/debconf/update-exim4.conf exim4-4.43/debian/debconf/update-exim4.conf
--- exim4-4.43.orig/debian/debconf/update-exim4.conf	2005-01-17 23:50:14.000000000 +0100
+++ exim4-4.43/debian/debconf/update-exim4.conf	2005-01-17 23:53:06.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)
Only in exim4-4.43/debian/debconf: update-exim4.conf~

--===============0967280341==--