Bug#514113: exim4-config: REMOTE_SMTP_HELO_DATA macro setting ignored

[Marco van Zwetselaar]

Package: exim4-config
Version: 4.69-9
Severity: normal
Tags: patch

Setting REMOTE_SMTP_HELO_DATA in exim4.conf.localmacros has no effect
because it is shielded (in transport/30_exim4-config_remote_smtp*) by 
.ifdef REMOTE_SMTP_HELO_FROM_DNS instead of
.ifdef REMOTE_SMTP_HELO_DATA.

Fix: in these files:
- transport/30_exim4-config_remote_smtp
- transport/30_exim4-config_remote_smtp_smarthost

replace the line reading:
.ifdef REMOTE_SMTP_HELO_FROM_DNS

by: 
.ifdef REMOTE_SMTP_HELO_DATA

Best regards,
Marco

-- Package-specific info:
Exim version 4.69 #1 built 30-Sep-2008 18:26:35
Copyright (c) University of Cambridge 2006
Berkeley DB: Berkeley DB 4.6.21: (September 27, 2007)
Support for: crypteq iconv() IPv6 GnuTLS move_frozen_messages
Lookups: lsearch wildlsearch nwildlsearch iplsearch cdb dbm dbmnz dnsdb dsearch nis nis0 passwd
Authenticators: cram_md5 plaintext
Routers: accept dnslookup ipliteral manualroute queryprogram redirect
Transports: appendfile/maildir/mailstore autoreply lmtp pipe smtp
Fixed never_users: 0
Size of off_t: 8
Configuration file is /var/lib/exim4/config.autogenerated

-- System Information:
Debian Release: 5.0
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'unstable')
Architecture: i386 (i686)

Kernel: Linux 2.6.26-12z1
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

Versions of packages exim4-config depends on:
ii  adduser                       3.110      add and remove users and groups
ii  debconf [debconf-2.0]         1.5.24     Debian configuration management sy

exim4-config recommends no packages.

exim4-config suggests no packages.

-- debconf information excluded