ph10 2006/10/18 09:55:38 BST
Modified files:
exim-doc/doc-txt ChangeLog
exim-src ACKNOWLEDGMENTS
exim-src/src readconf.c
exim-test/confs 2010
exim-test/scripts/2000-GnuTLS 2010
Log:
Fix tls_required and lost_connection retry testss not working.
Revision Changes Path
1.411 +4 -1 exim/exim-doc/doc-txt/ChangeLog
1.59 +2 -1 exim/exim-src/ACKNOWLEDGMENTS
1.25 +2 -2 exim/exim-src/src/readconf.c
1.3 +2 -1 exim/exim-test/confs/2010
1.3 +1 -1 exim/exim-test/scripts/2000-GnuTLS/2010
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.410
retrieving revision 1.411
diff -u -r1.410 -r1.411
--- ChangeLog 16 Oct 2006 15:44:36 -0000 1.410
+++ ChangeLog 18 Oct 2006 08:55:37 -0000 1.411
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.410 2006/10/16 15:44:36 ph10 Exp $
+$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.411 2006/10/18 08:55:37 ph10 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
@@ -150,10 +150,13 @@
local IP, and the "valid-client-cert option" if a client certificate has
been verified.
-PH/22 As suggested by Denis Davies, added a server_condition option to *all*
+PH/22 As suggested by Dennis Davis, added a server_condition option to *all*
authenticators. This can be used for authorization after authentication
succeeds. (In the case of plaintext, it servers for both authentication
and authorization.)
+
+PH/23 Testing for tls_required and lost_connection in a retry rule didn't work
+ if any retry times were supplied.
Exim version 4.63
Index: ACKNOWLEDGMENTS
===================================================================
RCS file: /home/cvs/exim/exim-src/ACKNOWLEDGMENTS,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- ACKNOWLEDGMENTS 16 Oct 2006 10:58:40 -0000 1.58
+++ ACKNOWLEDGMENTS 18 Oct 2006 08:55:37 -0000 1.59
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-src/ACKNOWLEDGMENTS,v 1.58 2006/10/16 10:58:40 ph10 Exp $
+$Cambridge: exim/exim-src/ACKNOWLEDGMENTS,v 1.59 2006/10/18 08:55:37 ph10 Exp $
EXIM ACKNOWLEDGEMENTS
@@ -20,7 +20,7 @@
Philip Hazel
Lists created: 20 November 2002
-Last updated: 16 October 2006
+Last updated: 18 October 2006
THE OLD LIST
@@ -94,6 +94,7 @@
Jennifer Corley Designing the new Exim logo
John Dalbec Patch for quota_warn_threshold bug
Vivek Dasmohapatra Suggested patch for CRL support
+Dennis Davis Suggested server_condition for all authenticators
Andrew Doran Patch for NetBSD configuration files
Patch for ifreq alignment and size problems
Michael Deutschmann Suggested patch for treating bind() failure like connect()
Index: readconf.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/readconf.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- readconf.c 19 Sep 2006 11:28:45 -0000 1.24
+++ readconf.c 18 Oct 2006 08:55:38 -0000 1.25
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/readconf.c,v 1.24 2006/09/19 11:28:45 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/readconf.c,v 1.25 2006/10/18 08:55:38 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -3455,10 +3455,10 @@
strncmpic(q+1, US"failed", p-q-1) == 0)
*basic_errno = ERRNO_AUTHFAIL;
-else if (strcmpic(pp, US"lost_connection") == 0)
+else if (strncmpic(pp, US"lost_connection", p - pp) == 0)
*basic_errno = ERRNO_SMTPCLOSED;
-else if (strcmpic(pp, US"tls_required") == 0)
+else if (strncmpic(pp, US"tls_required", p - pp) == 0)
*basic_errno = ERRNO_TLSREQUIRED;
else if (len != 1 || Ustrncmp(pp, "*", 1) != 0)
Index: 2010
===================================================================
RCS file: /home/cvs/exim/exim-test/confs/2010,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 2010 9 Mar 2006 15:10:17 -0000 1.2
+++ 2010 18 Oct 2006 08:55:38 -0000 1.3
@@ -1,6 +1,7 @@
# Exim test configuration 2010
SERVER =
+TIMES =
HOSTS = 127.0.0.1 : HOSTIPV4
exim_path = EXIM_PATH
@@ -54,7 +55,7 @@
begin retry
-* tls_required
+* tls_required TIMES
* * F,1d,5m
# End
Index: 2010
===================================================================
RCS file: /home/cvs/exim/exim-test/scripts/2000-GnuTLS/2010,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 2010 9 Mar 2006 15:10:17 -0000 1.2
+++ 2010 18 Oct 2006 08:55:38 -0000 1.3
@@ -5,7 +5,7 @@
exim userx@???
Test message
****
-exim -qf
+exim -qf -DTIMES=F,1h,1d
****
exim -DHOSTS=127.0.0.1 -qf
****
