ph10 2006/11/13 12:07:47 GMT
Modified files:
exim-doc/doc-txt ChangeLog NewStuff
exim-src/src expand.c
exim-test/confs 0282 0480
exim-test/mail 0282.userx
exim-test/stderr 0480
Log:
Rename $interface_address and $interface_port as $received_ip_address
and $received_port in an attempt to lessen confusion.
Revision Changes Path
1.432 +5 -0 exim/exim-doc/doc-txt/ChangeLog
1.122 +5 -0 exim/exim-doc/doc-txt/NewStuff
1.70 +2 -0 exim/exim-src/src/expand.c
1.2 +2 -1 exim/exim-test/confs/0282
1.2 +3 -3 exim/exim-test/confs/0480
1.2 +2 -0 exim/exim-test/mail/0282.userx
1.2 +1 -1 exim/exim-test/stderr/0480
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.431
retrieving revision 1.432
diff -u -r1.431 -r1.432
--- ChangeLog 13 Nov 2006 11:56:41 -0000 1.431
+++ ChangeLog 13 Nov 2006 12:07:46 -0000 1.432
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.431 2006/11/13 11:56:41 ph10 Exp $
+$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.432 2006/11/13 12:07:46 ph10 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
@@ -265,6 +265,11 @@
PH/41 Add bitwise logical operations to eval (courtesy Brad Jorsch).
PH/42 Give an error if -q is specified more than once.
+
+PH/43 Renamed the variables $interface_address and $interface_port as
+ $received_ip_address and $received_port, to make it clear that these
+ values apply to message reception, and not to the outgoing interface when
+ a message is delivered. (The old names remain recognized, of course.)
Exim version 4.63
Index: NewStuff
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/NewStuff,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- NewStuff 13 Nov 2006 11:26:37 -0000 1.121
+++ NewStuff 13 Nov 2006 12:07:46 -0000 1.122
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/NewStuff,v 1.121 2006/11/13 11:26:37 ph10 Exp $
+$Cambridge: exim/exim-doc/doc-txt/NewStuff,v 1.122 2006/11/13 12:07:46 ph10 Exp $
New Features in Exim
--------------------
@@ -191,6 +191,11 @@
${eval:0xc<<1} yields 24
${eval:~255&0x1234} yields 4608
${eval:-(~255&0x1234)} yields -4608
+
+11. The variables $interface_address and $interface_port have been renamed
+ as $received_ip_address and $received_port, to make it clear that they
+ relate to message reception rather than delivery. (The old names remain
+ available for compatibility.)
Version 4.63
Index: expand.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/expand.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- expand.c 13 Nov 2006 11:26:37 -0000 1.69
+++ expand.c 13 Nov 2006 12:07:46 -0000 1.70
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/expand.c,v 1.69 2006/11/13 11:26:37 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/expand.c,v 1.70 2006/11/13 12:07:46 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -436,6 +436,8 @@
{ "rcpt_fail_count", vtype_int, &rcpt_fail_count },
{ "received_count", vtype_int, &received_count },
{ "received_for", vtype_stringptr, &received_for },
+ { "received_ip_address", vtype_stringptr, &interface_address },
+ { "received_port", vtype_int, &interface_port },
{ "received_protocol", vtype_stringptr, &received_protocol },
{ "received_time", vtype_int, &received_time },
{ "recipient_data", vtype_stringptr, &recipient_data },
Index: 0282
===================================================================
RCS file: /home/cvs/exim/exim-test/confs/0282,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0282 7 Feb 2006 10:34:25 -0000 1.1
+++ 0282 13 Nov 2006 12:07:46 -0000 1.2
@@ -33,6 +33,7 @@
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
Index: 0480
===================================================================
RCS file: /home/cvs/exim/exim-test/confs/0480,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0480 7 Feb 2006 10:34:26 -0000 1.1
+++ 0480 13 Nov 2006 12:07:46 -0000 1.2
@@ -18,13 +18,13 @@
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}\
}}\
Index: 0282.userx
===================================================================
RCS file: /home/cvs/exim/exim-test/mail/0282.userx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0282.userx 7 Feb 2006 10:34:59 -0000 1.1
+++ 0282.userx 13 Nov 2006 12:07:46 -0000 1.2
@@ -5,6 +5,7 @@
id 10HmaX-0005vi-00
for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
interface-port: 1225
+received-port: 1225
This is a test message.
@@ -15,6 +16,7 @@
id 10HmaY-0005vi-00
for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
interface-port: 1226
+received-port: 1226
This is a test message.
Index: 0480
===================================================================
RCS file: /home/cvs/exim/exim-test/stderr/0480,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0480 7 Feb 2006 10:47:31 -0000 1.1
+++ 0480 13 Nov 2006 12:07:47 -0000 1.2
@@ -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)
