ph10 2006/02/28 12:42:47 GMT
Modified files:
exim-doc/doc-txt ChangeLog NewStuff OptionLists.txt
exim-src/src/transports smtp.c smtp.h
exim-test/confs 0001 0215
exim-test/log 0215
exim-test/scripts/0000-Basic 0215
exim-test/stdout 0215
Log:
Add authenticated_sender_force to the smtp transport.
Revision Changes Path
1.315 +2 -0 exim/exim-doc/doc-txt/ChangeLog
1.92 +4 -0 exim/exim-doc/doc-txt/NewStuff
1.19 +1 -0 exim/exim-doc/doc-txt/OptionLists.txt
1.23 +5 -1 exim/exim-src/src/transports/smtp.c
1.8 +1 -0 exim/exim-src/src/transports/smtp.h
1.3 +1 -0 exim/exim-test/confs/0001
1.2 +4 -0 exim/exim-test/confs/0215
1.2 +4 -0 exim/exim-test/log/0215
1.2 +30 -0 exim/exim-test/scripts/0000-Basic/0215
1.2 +24 -0 exim/exim-test/stdout/0215
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.314
retrieving revision 1.315
diff -u -r1.314 -r1.315
--- ChangeLog 28 Feb 2006 11:25:40 -0000 1.314
+++ ChangeLog 28 Feb 2006 12:42:47 -0000 1.315
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.314 2006/02/28 11:25:40 ph10 Exp $
+$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.315 2006/02/28 12:42:47 ph10 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
@@ -238,6 +238,8 @@
PH/46 Messages that are created by the autoreply transport now contains a
References: header, in accordance with RFCs 2822 and 3834.
+
+PH/47 Added authenticated_sender_force to the smtp transport.
Exim version 4.60
Index: NewStuff
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/NewStuff,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- NewStuff 28 Feb 2006 11:25:40 -0000 1.91
+++ NewStuff 28 Feb 2006 12:42:47 -0000 1.92
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/NewStuff,v 1.91 2006/02/28 11:25:40 ph10 Exp $
+$Cambridge: exim/exim-doc/doc-txt/NewStuff,v 1.92 2006/02/28 12:42:47 ph10 Exp $
New Features in Exim
--------------------
@@ -97,6 +97,10 @@
line in the incoming message. If there are more than 12, the first one
and then the final 11 are copied, before adding the message ID of the
incoming message.
+
+PH/15 The smtp transport has a new option called authenticated_sender_force.
+ When set true, it allows the authenticated_sender option's value to be
+ used, even if Exim has not authenticated as a client.
Version 4.60
Index: OptionLists.txt
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/OptionLists.txt,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- OptionLists.txt 23 Feb 2006 12:41:22 -0000 1.18
+++ OptionLists.txt 28 Feb 2006 12:42:47 -0000 1.19
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/OptionLists.txt,v 1.18 2006/02/23 12:41:22 ph10 Exp $
+$Cambridge: exim/exim-doc/doc-txt/OptionLists.txt,v 1.19 2006/02/28 12:42:47 ph10 Exp $
LISTS OF EXIM OPTIONS
---------------------
@@ -83,6 +83,7 @@
allow_utf8_domains boolean false main 4.14
auth_advertise_hosts host list "*" main 4.00
authenticated_sender string* unset smtp 4.14
+authenticated_sender_force boolean false smtp 4.61
authenticate_hosts host list unset smtp 3.13
auto_thaw time 0s main
av_scanner string* + main 4.50 with content scan
Index: smtp.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/transports/smtp.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- smtp.c 23 Feb 2006 12:41:23 -0000 1.22
+++ smtp.c 28 Feb 2006 12:42:47 -0000 1.23
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/transports/smtp.c,v 1.22 2006/02/23 12:41:23 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/transports/smtp.c,v 1.23 2006/02/28 12:42:47 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -25,6 +25,8 @@
(void *)offsetof(smtp_transport_options_block, allow_localhost) },
{ "authenticated_sender", opt_stringptr,
(void *)offsetof(smtp_transport_options_block, authenticated_sender) },
+ { "authenticated_sender_force", opt_bool,
+ (void *)offsetof(smtp_transport_options_block, authenticated_sender_force) },
{ "command_timeout", opt_time,
(void *)offsetof(smtp_transport_options_block, command_timeout) },
{ "connect_timeout", opt_time,
@@ -158,6 +160,7 @@
5, /* hosts_max_try */
50, /* hosts_max_try_hardlimit */
FALSE, /* allow_localhost */
+ FALSE, /* authenticated_sender_force */
FALSE, /* gethostbyname */
TRUE, /* dns_qualify_single */
FALSE, /* dns_search_parents */
@@ -1310,7 +1313,8 @@
/* Add the authenticated sender address if present */
-if (smtp_authenticated && local_authenticated_sender != NULL)
+if ((smtp_authenticated || ob->authenticated_sender_force) &&
+ local_authenticated_sender != NULL)
{
string_format(p, sizeof(buffer) - (p-buffer), " AUTH=%s",
auth_xtextencode(local_authenticated_sender,
Index: smtp.h
===================================================================
RCS file: /home/cvs/exim/exim-src/src/transports/smtp.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- smtp.h 7 Feb 2006 11:19:03 -0000 1.7
+++ smtp.h 28 Feb 2006 12:42:47 -0000 1.8
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/transports/smtp.h,v 1.7 2006/02/07 11:19:03 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/transports/smtp.h,v 1.8 2006/02/28 12:42:47 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -34,6 +34,7 @@
int hosts_max_try;
int hosts_max_try_hardlimit;
BOOL allow_localhost;
+ BOOL authenticated_sender_force;
BOOL gethostbyname;
BOOL dns_qualify_single;
BOOL dns_search_parents;
Index: 0001
===================================================================
RCS file: /home/cvs/exim/exim-test/confs/0001,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 0001 22 Feb 2006 15:08:20 -0000 1.2
+++ 0001 28 Feb 2006 12:42:47 -0000 1.3
@@ -574,6 +574,7 @@
smtp:
driver = smtp
authenticated_sender = abcde
+ authenticated_sender_force = true
no_allow_localhost
command_timeout = 5m
connect_timeout = 0s
Index: 0215
===================================================================
RCS file: /home/cvs/exim/exim-test/confs/0215,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0215 7 Feb 2006 10:34:25 -0000 1.1
+++ 0215 28 Feb 2006 12:42:47 -0000 1.2
@@ -1,6 +1,8 @@
# Exim test configuration 0215
IGNORE_QUOTA=false
+AUTHS=
+AUTHF=
exim_path = EXIM_PATH
host_lookup_order = bydns
@@ -45,6 +47,8 @@
port = PORT_S
protocol = LMTP
lmtp_ignore_quota = IGNORE_QUOTA
+ AUTHS
+ AUTHF
# ----- Retry -----
Index: 0215
===================================================================
RCS file: /home/cvs/exim/exim-test/log/0215,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0215 7 Feb 2006 10:34:46 -0000 1.1
+++ 0215 28 Feb 2006 12:42:47 -0000 1.2
@@ -45,3 +45,7 @@
1999-03-02 09:44:33 10HmbF-0005vi-00 -> userxy@??? F=<CALLER@???> R=smartuser T=lmtp H=127.0.0.1 [127.0.0.1]
1999-03-02 09:44:33 10HmbF-0005vi-00 -> userxz@??? F=<CALLER@???> R=smartuser T=lmtp H=127.0.0.1 [127.0.0.1]
1999-03-02 09:44:33 10HmbF-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbG-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
+1999-03-02 09:44:33 10HmbG-0005vi-00 == userx@??? R=smartuser T=lmtp defer (-44): SMTP error from remote mail server after RCPT TO:<userx@???>: host 127.0.0.1 [127.0.0.1]: 450 LATER
+1999-03-02 09:44:33 10HmbH-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
+1999-03-02 09:44:33 10HmbH-0005vi-00 == userx@??? R=smartuser T=lmtp defer (-44): SMTP error from remote mail server after RCPT TO:<userx@???>: host 127.0.0.1 [127.0.0.1]: 450 LATER
Index: 0215
===================================================================
RCS file: /home/cvs/exim/exim-test/scripts/0000-Basic/0215,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0215 7 Feb 2006 10:54:33 -0000 1.1
+++ 0215 28 Feb 2006 12:42:47 -0000 1.2
@@ -189,4 +189,34 @@
exim -odi -DIGNORE_QUOTA=true userxx userxy userxz
This is a test message.
****
+# Tests for authenticated_sender forcing: this one doesn't do it
+server PORT_S
+220 ESMTP
+LHLO
+250 OK
+MAIL FROM:
+250 Sender OK
+RCPT TO:
+450 LATER
+QUIT
+250 OK
+****
+exim -odi -DAUTHS=authenticated_sender=xxx@yyy userx
+Another test message.
+****
+# Tests for authenticated_sender forcing: this one does it
+server PORT_S
+220 ESMTP
+LHLO
+250 OK
+MAIL FROM:
+250 Sender OK
+RCPT TO:
+450 LATER
+QUIT
+250 OK
+****
+exim -odi -DAUTHS=authenticated_sender=xxx@yyy -DAUTHF=authenticated_sender_force userx
+Another test message.
+****
no_msglog_check
Index: 0215
===================================================================
RCS file: /home/cvs/exim/exim-test/stdout/0215,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0215 7 Feb 2006 10:47:37 -0000 1.1
+++ 0215 28 Feb 2006 12:42:47 -0000 1.2
@@ -217,3 +217,27 @@
QUIT
250 OK
End of script
+Listening on port 1224 ...
+Connection request from [127.0.0.1]
+220 ESMTP
+LHLO myhost.test.ex
+250 OK
+MAIL FROM:<CALLER@???>
+250 Sender OK
+RCPT TO:<userx@???>
+450 LATER
+QUIT
+250 OK
+End of script
+Listening on port 1224 ...
+Connection request from [127.0.0.1]
+220 ESMTP
+LHLO myhost.test.ex
+250 OK
+MAIL FROM:<CALLER@???> AUTH=xxx@yyy
+250 Sender OK
+RCPT TO:<userx@???>
+450 LATER
+QUIT
+250 OK
+End of script
