ph10 2004/12/22 12:05:46 GMT
Modified files:
exim-doc/doc-txt ChangeLog NewStuff
exim-src/exim_monitor em_globals.c
exim-src/src expand.c globals.c spool_in.c spool_out.c
exim-test-orig/AutoTest/confs 560
exim-test-orig/AutoTest/log 560 598
exim-test-orig/AutoTest/mail 598.ph10
exim-test-orig/AutoTest/scripts 560
exim-test-orig/AutoTest/stdout 001 560
Added files:
exim-test-orig/AutoTest/mail 560.ph10
Log:
Added $smtp_active_hostname as a variable, and used it in smtp_banner
default value instead of $primary_hostname.
Revision Changes Path
1.57 +6 -0 exim/exim-doc/doc-txt/ChangeLog
1.23 +9 -0 exim/exim-doc/doc-txt/NewStuff
1.3 +1 -0 exim/exim-src/exim_monitor/em_globals.c
1.9 +1 -0 exim/exim-src/src/expand.c
1.11 +1 -1 exim/exim-src/src/globals.c
1.3 +3 -0 exim/exim-src/src/spool_in.c
1.3 +3 -0 exim/exim-src/src/spool_out.c
1.2 +1 -0 exim/exim-test-orig/AutoTest/confs/560
1.2 +3 -0 exim/exim-test-orig/AutoTest/log/560
1.3 +2 -2 exim/exim-test-orig/AutoTest/log/598
1.1 +8 -0 exim/exim-test-orig/AutoTest/mail/560.ph10 (new)
1.3 +12 -10 exim/exim-test-orig/AutoTest/mail/598.ph10
1.2 +12 -0 exim/exim-test-orig/AutoTest/scripts/560
1.4 +1 -1 exim/exim-test-orig/AutoTest/stdout/001
1.2 +14 -2 exim/exim-test-orig/AutoTest/stdout/560
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- ChangeLog 21 Dec 2004 16:26:31 -0000 1.56
+++ ChangeLog 22 Dec 2004 12:05:45 -0000 1.57
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.56 2004/12/21 16:26:31 ph10 Exp $
+$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.57 2004/12/22 12:05:45 ph10 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
@@ -246,6 +246,12 @@
58. The exicyclog utility now does better if the number of log files to keep
exceeds 99. In this case, it numbers them 001, 002 ... instead of 01, 02...
+
+59. Two changes related to the smtp_active_hostname option:
+
+ (1) $smtp_active_hostname is now available as a variable.
+ (2) The default for smtp_banner uses $smtp_active_hostname instead
+ of $primary_hostname.
Exim version 4.43
Index: NewStuff
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/NewStuff,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- NewStuff 21 Dec 2004 12:21:46 -0000 1.22
+++ NewStuff 22 Dec 2004 12:05:45 -0000 1.23
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/NewStuff,v 1.22 2004/12/21 12:21:46 ph10 Exp $
+$Cambridge: exim/exim-doc/doc-txt/NewStuff,v 1.23 2004/12/22 12:05:45 ph10 Exp $
New Features in Exim
--------------------
@@ -237,6 +237,15 @@
20. If the key for a dnsdb lookup is not an IP address, it is used verbatim,
without component reversal and without the addition of in-addr.arpa or
ip6.arpa.
+
+21. Two changes related to the smtp_active_hostname option:
+
+ (1) $smtp_active_hostname is now available as a variable. Its value
+ sticks with the message and is therefore available in routers and
+ transports at delivery time.
+
+ (2) The default for smtp_banner uses $smtp_active_hostname instead
+ of $primary_hostname.
Version 4.43
Index: em_globals.c
===================================================================
RCS file: /home/cvs/exim/exim-src/exim_monitor/em_globals.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- em_globals.c 16 Dec 2004 15:11:47 -0000 1.2
+++ em_globals.c 22 Dec 2004 12:05:45 -0000 1.3
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/exim_monitor/em_globals.c,v 1.2 2004/12/16 15:11:47 tom Exp $ */
+/* $Cambridge: exim/exim-src/exim_monitor/em_globals.c,v 1.3 2004/12/22 12:05:45 ph10 Exp $ */
/*************************************************
* Exim Monitor *
@@ -189,6 +189,7 @@
uschar *sender_ident = NULL;
BOOL sender_local = FALSE;
BOOL sender_set_untrusted = FALSE;
+uschar *smtp_active_hostname = NULL;
BOOL split_spool_directory = FALSE;
uschar *spool_directory = US SPOOL_DIRECTORY;
Index: expand.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/expand.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- expand.c 16 Dec 2004 15:11:47 -0000 1.8
+++ expand.c 22 Dec 2004 12:05:46 -0000 1.9
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/expand.c,v 1.8 2004/12/16 15:11:47 tom Exp $ */
+/* $Cambridge: exim/exim-src/src/expand.c,v 1.9 2004/12/22 12:05:46 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -450,6 +450,7 @@
{ "sender_ident", vtype_stringptr, &sender_ident },
{ "sender_rcvhost", vtype_stringptr, &sender_rcvhost },
{ "sender_verify_failure",vtype_stringptr, &sender_verify_failure },
+ { "smtp_active_hostname", vtype_stringptr, &smtp_active_hostname },
{ "smtp_command_argument", vtype_stringptr, &smtp_command_argument },
{ "sn0", vtype_filter_int, &filter_sn[0] },
{ "sn1", vtype_filter_int, &filter_sn[1] },
Index: globals.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/globals.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- globals.c 17 Dec 2004 14:52:44 -0000 1.10
+++ globals.c 22 Dec 2004 12:05:46 -0000 1.11
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/globals.c,v 1.10 2004/12/17 14:52:44 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/globals.c,v 1.11 2004/12/22 12:05:46 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -974,7 +974,7 @@
int smtp_accept_reserve = 0;
uschar *smtp_active_hostname = NULL;
BOOL smtp_authenticated = FALSE;
-uschar *smtp_banner = US"$primary_hostname ESMTP "
+uschar *smtp_banner = US"$smtp_active_hostname ESMTP "
"Exim $version_number $tod_full"
"\0<---------------Space to patch smtp_banner->";
BOOL smtp_batched_input = FALSE;
Index: spool_in.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/spool_in.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- spool_in.c 16 Dec 2004 15:11:47 -0000 1.2
+++ spool_in.c 22 Dec 2004 12:05:46 -0000 1.3
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/spool_in.c,v 1.2 2004/12/16 15:11:47 tom Exp $ */
+/* $Cambridge: exim/exim-src/src/spool_in.c,v 1.3 2004/12/22 12:05:46 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -269,6 +269,7 @@
sender_ident = NULL;
sender_local = FALSE;
sender_set_untrusted = FALSE;
+smtp_active_hostname = primary_hostname;
tree_nonrecipients = NULL;
#ifdef EXPERIMENTAL_BRIGHTMAIL
@@ -438,6 +439,8 @@
interface_address = string_copy(big_buffer + 19);
}
+ else if (Ustrncmp(big_buffer, "-active_hostname", 16) == 0)
+ smtp_active_hostname = string_copy(big_buffer + 17);
else if (Ustrncmp(big_buffer, "-host_auth", 10) == 0)
sender_host_authenticated = string_copy(big_buffer + 11);
else if (Ustrncmp(big_buffer, "-host_name", 10) == 0)
Index: spool_out.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/spool_out.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- spool_out.c 16 Dec 2004 15:11:47 -0000 1.2
+++ spool_out.c 22 Dec 2004 12:05:46 -0000 1.3
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/spool_out.c,v 1.2 2004/12/16 15:11:47 tom Exp $ */
+/* $Cambridge: exim/exim-src/src/spool_out.c,v 1.3 2004/12/22 12:05:46 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -175,6 +175,9 @@
if (interface_address != NULL)
fprintf(f, "-interface_address %s.%d\n", interface_address, interface_port);
+
+if (smtp_active_hostname != primary_hostname)
+ fprintf(f, "-active_hostname %s\n", smtp_active_hostname);
/* Likewise for any ident information; for local messages this is
likely to be the same as originator_login, but will be different if
Index: 560
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/confs/560,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 560 8 Oct 2004 14:49:16 -0000 1.1
+++ 560 22 Dec 2004 12:05:46 -0000 1.2
@@ -36,6 +36,7 @@
r1:
driver = accept
+ headers_add = X-sah: $smtp_active_hostname
transport = t1
Index: 560
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/560,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 560 8 Oct 2004 14:49:31 -0000 1.1
+++ 560 22 Dec 2004 12:05:46 -0000 1.2
@@ -1 +1,4 @@
1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 (IPv6 and IPv4)
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= <> H=(foobar) [127.0.0.1] U=ph10 P=smtp S=172
+1999-03-02 09:44:33 10HmaX-0005vi-00 => ph10 <ph10@???> R=r1 T=t1
+1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
Index: 598
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/598,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 598 21 Dec 2004 14:38:02 -0000 1.2
+++ 598 22 Dec 2004 12:05:46 -0000 1.3
@@ -1,13 +1,13 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local-esmtp S=986
1999-03-02 09:44:33 10HmaX-0005vi-00 => ph10 <ph10@???> R=r1 T=t1
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= ph10@??? U=ph10 P=local-esmtp S=1048 id=41C2F849.3060203@???
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= ph10@??? U=ph10 P=local-esmtp S=1125 id=41C2F849.3060203@???
1999-03-02 09:44:33 10HmaY-0005vi-00 => ph10 <ph10@???> R=r1 T=t1
1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
1999-03-02 09:44:33 10HmaZ-0005vi-00 <= ph10@??? U=ph10 P=local-esmtp S=1466 id=abcde
1999-03-02 09:44:33 10HmaZ-0005vi-00 => ph10 <ph10@???> R=r1 T=t1
1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbA-0005vi-00 <= ph10@??? U=ph10 P=local-esmtp S=1164 id=41C2F849.3060203@???
+1999-03-02 09:44:33 10HmbA-0005vi-00 <= ph10@??? U=ph10 P=local-esmtp S=1241 id=41C2F849.3060203@???
1999-03-02 09:44:33 10HmbA-0005vi-00 => ph10 <ph10@???> R=r1 T=t1
1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
1999-03-02 09:44:33 10HmbB-0005vi-00 <= ph10@??? U=ph10 P=local-esmtp S=4389 id=20041217133501.GA3058@???
Index: 560.ph10
====================================================================
From MAILER-DAEMON Tue Mar 02 09:44:33 1999
Received: from [127.0.0.1] (helo=foobar ident=ph10)
by xoanon.csi.cam.ac.uk with smtp (Exim x.yz)
id 10HmaX-0005vi-00
for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
X-sah: host.127.0.0.1
Index: 598.ph10
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/598.ph10,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 598.ph10 21 Dec 2004 14:38:02 -0000 1.2
+++ 598.ph10 22 Dec 2004 12:05:46 -0000 1.3
@@ -34,19 +34,20 @@
Date: Tue, 2 Mar 1999 09:44:33 +0000
Message-ID: <41C2F849.3060203@???>
Sender: Philip Hazel <ph10@???>
-X-Spam_score: 0.0
-X-Spam_score_int: 0
-X-Spam_bar: /
+X-Spam_score: 1.2
+X-Spam_score_int: 12
+X-Spam_bar: +
X-Spam_report: Spam detection software, running on the system "xoanon.csi.cam.ac.uk", has
identified this incoming email as possible spam. The original message
has been attached to this so you can view it (if it isn't spam) or block
similar future email. If you have any questions, see
the administrator of that system for details.
Content preview: OK, this should look like a genuine message. [...]
- Content analysis details: (0.0 points, 5.0 required)
+ Content analysis details: (1.2 points, 5.0 required)
pts rule name description
---- ---------------------- --------------------------------------------------
-X-Router-SSint: 0
+ 1.2 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date
+X-Router-SSint: 12
OK, this should look like a genuine message.
@@ -97,9 +98,9 @@
Message-ID: <41C2F849.3060203@???>
FakeReject: test fakereject
Sender: Philip Hazel <ph10@???>
-X-Spam_score: 0.0
-X-Spam_score_int: 0
-X-Spam_bar: /
+X-Spam_score: 1.2
+X-Spam_score_int: 12
+X-Spam_bar: +
X-Spam_report: Spam detection software, running on the system "xoanon.csi.cam.ac.uk", has
identified this incoming email as possible spam. The original message
has been attached to this so you can view it (if it isn't spam) or block
@@ -107,11 +108,12 @@
the administrator of that system for details.
Content preview: OK, this should look like a genuine message, but it
will trip on THIS REGEX. [...]
- Content analysis details: (0.0 points, 5.0 required)
+ Content analysis details: (1.2 points, 5.0 required)
pts rule name description
---- ---------------------- --------------------------------------------------
+ 1.2 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date
X-Regex: Regex matched
-X-Router-SSint: 0
+X-Router-SSint: 12
OK, this should look like a genuine message, but
it will trip on THIS REGEX.
Index: 560
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/scripts/560,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 560 8 Oct 2004 14:49:53 -0000 1.1
+++ 560 22 Dec 2004 12:05:46 -0000 1.2
@@ -29,8 +29,20 @@
??? 220
helo foobar
??? 250
+mail from:<>
+??? 250
+rcpt to:<ph10@???>
+??? 250
+data
+??? 354
+.
+??? 250
quit
??? 221
+****
+# Wait for it to be delivered
+0
+sleep 1
****
0
client ::1 1225
Index: 001
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stdout/001,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 001 17 Dec 2004 14:52:44 -0000 1.3
+++ 001 22 Dec 2004 12:05:46 -0000 1.4
@@ -148,7 +148,7 @@
smtp_accept_queue_per_connection = 10
smtp_accept_reserve = 0
smtp_active_hostname =
-smtp_banner = $primary_hostname ESMTP Exim $version_number $tod_full
+smtp_banner = $smtp_active_hostname ESMTP Exim $version_number $tod_full
smtp_check_spool_space
smtp_connect_backlog = 20
smtp_enforce_sync
Index: 560
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stdout/560,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 560 8 Oct 2004 14:50:14 -0000 1.1
+++ 560 22 Dec 2004 12:05:46 -0000 1.2
@@ -3,7 +3,7 @@
**** but without any ident (RFC 1413) callback.
**** This is not for real!
-220 xoanon.csi.cam.ac.uk ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+220 host.10.0.0.1 ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 host.10.0.0.1 Hello a.b.c [1.2.3.4]
221 host.10.0.0.1 closing connection
@@ -24,10 +24,22 @@
221 xoanon.csi.cam.ac.uk closing connection
Connecting to 127.0.0.1 port 1225 ... connected
??? 220
-<<< 220 xoanon.csi.cam.ac.uk ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+<<< 220 host.127.0.0.1 ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
>>> helo foobar
??? 250
<<< 250 host.127.0.0.1 Hello ph10 at foobar [127.0.0.1]
+>>> mail from:<>
+??? 250
+<<< 250 OK
+>>> rcpt to:<ph10@???>
+??? 250
+<<< 250 Accepted
+>>> data
+??? 354
+<<< 354 Enter message, ending with "." on a line by itself
+>>> .
+??? 250
+<<< 250 OK id=10HmaX-0005vi-00
>>> quit
??? 221
<<< 221 host.127.0.0.1 closing connection
