diff options
| author | Philip Hazel <ph10@hermes.cam.ac.uk> | 2006-11-13 12:07:46 +0000 |
|---|---|---|
| committer | Philip Hazel <ph10@hermes.cam.ac.uk> | 2006-11-13 12:07:46 +0000 |
| commit | 194cc0e4ae3487900036c6bd208c0784d4e6e814 (patch) | |
| tree | 1110a6dfb5e288edd31a0d0e6a6883de142e362c /test | |
| parent | 3cc66b4537846d0f9211fcb63c426be9a553edb1 (diff) | |
Rename $interface_address and $interface_port as $received_ip_address
and $received_port in an attempt to lessen confusion.
Diffstat (limited to 'test')
| -rw-r--r-- | test/confs/0282 | 3 | ||||
| -rw-r--r-- | test/confs/0480 | 6 | ||||
| -rw-r--r-- | test/mail/0282.userx | 2 | ||||
| -rw-r--r-- | test/stderr/0480 | 2 |
4 files changed, 8 insertions, 5 deletions
diff --git a/test/confs/0282 b/test/confs/0282 index 0952977ab..9ebe5ad81 100644 --- a/test/confs/0282 +++ b/test/confs/0282 @@ -33,6 +33,7 @@ local_delivery: driver = appendfile file = DIR/test-mail/$local_part user = CALLER - headers_add = interface-port: $interface_port + headers_add = interface-port: $interface_port\n\ + received-port: $received_port # End diff --git a/test/confs/0480 b/test/confs/0480 index 3308c0663..c8adb1ba5 100644 --- a/test/confs/0480 +++ b/test/confs/0480 @@ -18,13 +18,13 @@ gecos_name = CALLER_NAME acl_smtp_rcpt = accept -smtp_active_hostname = ${if eq{$interface_address}{IP1}\ +smtp_active_hostname = ${if eq{$received_ip_address}{IP1}\ {host.IP1}\ {\ - ${if eq{$interface_address}{IP2}\ + ${if eq{$received_ip_address}{IP2}\ {}\ {\ - ${if eq{$interface_address}{IP3}\ + ${if eq{$received_ip_address}{IP3}\ {${lookup{x}lsearch{/non/exist}}}\ fail}\ }}\ diff --git a/test/mail/0282.userx b/test/mail/0282.userx index e01c84b0c..abd61fa18 100644 --- a/test/mail/0282.userx +++ b/test/mail/0282.userx @@ -5,6 +5,7 @@ Received: from [127.0.0.1] (port=1111 helo=rhu.barb) id 10HmaX-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 interface-port: 1225 +received-port: 1225 This is a test message. @@ -15,6 +16,7 @@ Received: from [127.0.0.1] (port=1112 helo=rhu.barb) id 10HmaY-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 interface-port: 1226 +received-port: 1226 This is a test message. diff --git a/test/stderr/0480 b/test/stderr/0480 index b3f00895f..507e1d082 100644 --- a/test/stderr/0480 +++ b/test/stderr/0480 @@ -16,7 +16,7 @@ >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) >>> a.b.c in helo_lookup_domains? no (end of list) -LOG: failed to expand "${if eq{$interface_address}{V4NET.0.0.1}{host.V4NET.0.0.1}{${if eq{$interface_address}{V4NET.0.0.2}{}{${if eq{$interface_address}{V4NET.0.0.3}{${lookup{x}lsearch{/non/exist}}}fail}}}}}" (smtp_active_hostname): failed to open /non/exist for linear search: No such file or directory +LOG: failed to expand "${if eq{$received_ip_address}{V4NET.0.0.1}{host.V4NET.0.0.1}{${if eq{$received_ip_address}{V4NET.0.0.2}{}{${if eq{$received_ip_address}{V4NET.0.0.3}{${lookup{x}lsearch{/non/exist}}}fail}}}}}" (smtp_active_hostname): failed to open /non/exist for linear search: No such file or directory >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) |