From 48da425923d2c912902cc946782e4ea8075a4386 Mon Sep 17 00:00:00 2001 From: Philip Hazel Date: Wed, 18 Oct 2006 08:55:37 +0000 Subject: [PATCH] Fix tls_required and lost_connection retry testss not working. --- doc/doc-txt/ChangeLog | 7 +++++-- src/ACKNOWLEDGMENTS | 5 +++-- src/src/readconf.c | 6 +++--- test/confs/2010 | 3 ++- test/scripts/2000-GnuTLS/2010 | 2 +- 5 files changed, 14 insertions(+), 9 deletions(-) diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index 19a3ae0dd..6059f6b6f 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -1,4 +1,4 @@ -$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.410 2006/10/16 15:44:36 ph10 Exp $ +$Cambridge: 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,11 +150,14 @@ PH/21 On the advice of Timo Sirainen, added a check to the dovecot 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 ----------------- diff --git a/src/ACKNOWLEDGMENTS b/src/ACKNOWLEDGMENTS index 049e30969..771e6ec08 100644 --- a/src/ACKNOWLEDGMENTS +++ b/src/ACKNOWLEDGMENTS @@ -1,4 +1,4 @@ -$Cambridge: exim/src/ACKNOWLEDGMENTS,v 1.58 2006/10/16 10:58:40 ph10 Exp $ +$Cambridge: exim/src/ACKNOWLEDGMENTS,v 1.59 2006/10/18 08:55:37 ph10 Exp $ EXIM ACKNOWLEDGEMENTS @@ -20,7 +20,7 @@ relatively small patches. Philip Hazel Lists created: 20 November 2002 -Last updated: 16 October 2006 +Last updated: 18 October 2006 THE OLD LIST @@ -94,6 +94,7 @@ Oliver Cook Suggested patch for exigrep & rejected messages 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() diff --git a/src/src/readconf.c b/src/src/readconf.c index fd04ab328..11f53987c 100644 --- a/src/src/readconf.c +++ b/src/src/readconf.c @@ -1,4 +1,4 @@ -/* $Cambridge: exim/src/src/readconf.c,v 1.24 2006/09/19 11:28:45 ph10 Exp $ */ +/* $Cambridge: 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 @@ else if (len == 4 && strncmpic(pp, US"auth", len) == 0 && 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) diff --git a/test/confs/2010 b/test/confs/2010 index c08d4ce49..2415c685e 100644 --- a/test/confs/2010 +++ b/test/confs/2010 @@ -1,6 +1,7 @@ # Exim test configuration 2010 SERVER = +TIMES = HOSTS = 127.0.0.1 : HOSTIPV4 exim_path = EXIM_PATH @@ -54,7 +55,7 @@ send_to_server: begin retry -* tls_required +* tls_required TIMES * * F,1d,5m # End diff --git a/test/scripts/2000-GnuTLS/2010 b/test/scripts/2000-GnuTLS/2010 index 02c82ea79..46bd35b5c 100644 --- a/test/scripts/2000-GnuTLS/2010 +++ b/test/scripts/2000-GnuTLS/2010 @@ -5,7 +5,7 @@ exim -DSERVER=server -bd -oX PORT_D exim userx@test.ex Test message **** -exim -qf +exim -qf -DTIMES=F,1h,1d **** exim -DHOSTS=127.0.0.1 -qf **** -- 2.25.1