git://git.exim.org
/
users
/
jgh
/
exim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
16ff981
)
Fix tls_required and lost_connection retry testss not working.
author
Philip Hazel
<ph10@hermes.cam.ac.uk>
Wed, 18 Oct 2006 08:55:37 +0000
(08:55 +0000)
committer
Philip Hazel
<ph10@hermes.cam.ac.uk>
Wed, 18 Oct 2006 08:55:37 +0000
(08:55 +0000)
doc/doc-txt/ChangeLog
patch
|
blob
|
history
src/ACKNOWLEDGMENTS
patch
|
blob
|
history
src/src/readconf.c
patch
|
blob
|
history
test/confs/2010
patch
|
blob
|
history
test/scripts/2000-GnuTLS/2010
patch
|
blob
|
history
diff --git
a/doc/doc-txt/ChangeLog
b/doc/doc-txt/ChangeLog
index 19a3ae0ddec476e53db84aefc94cddb80e2330a4..6059f6b6f6b4c438ff99b4793b1627a2ca699f0c 100644
(file)
--- a/
doc/doc-txt/ChangeLog
+++ b/
doc/doc-txt/ChangeLog
@@
-1,4
+1,4
@@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.41
0 2006/10/16 15:44:36
ph10 Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.41
1 2006/10/18 08:55:37
ph10 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
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.
local IP, and the "valid-client-cert option" if a client certificate has
been verified.
-PH/22 As suggested by Den
is Davie
s, added a server_condition option to *all*
+PH/22 As suggested by Den
nis Davi
s, 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.)
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
-----------------
Exim version 4.63
-----------------
diff --git
a/src/ACKNOWLEDGMENTS
b/src/ACKNOWLEDGMENTS
index 049e3096982727637d88b27c99e67c289de78c51..771e6ec089a0f353cda033a6520448ed41dec44c 100644
(file)
--- a/
src/ACKNOWLEDGMENTS
+++ b/
src/ACKNOWLEDGMENTS
@@
-1,4
+1,4
@@
-$Cambridge: exim/src/ACKNOWLEDGMENTS,v 1.5
8 2006/10/16 10:58:40
ph10 Exp $
+$Cambridge: exim/src/ACKNOWLEDGMENTS,v 1.5
9 2006/10/18 08:55:37
ph10 Exp $
EXIM ACKNOWLEDGEMENTS
EXIM ACKNOWLEDGEMENTS
@@
-20,7
+20,7
@@
relatively small patches.
Philip Hazel
Lists created: 20 November 2002
Philip Hazel
Lists created: 20 November 2002
-Last updated: 1
6
October 2006
+Last updated: 1
8
October 2006
THE OLD LIST
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
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()
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 fd04ab328917cfc90929d3e7f79edbd5b88564a7..11f53987cdb3f985045700a8abc139d24297f320 100644
(file)
--- a/
src/src/readconf.c
+++ b/
src/src/readconf.c
@@
-1,4
+1,4
@@
-/* $Cambridge: exim/src/src/readconf.c,v 1.2
4 2006/09/19 11:28:45
ph10 Exp $ */
+/* $Cambridge: exim/src/src/readconf.c,v 1.2
5 2006/10/18 08:55:38
ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
/*************************************************
* 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;
strncmpic(q+1, US"failed", p-q-1) == 0)
*basic_errno = ERRNO_AUTHFAIL;
-else if (str
cmpic(pp, US"lost_connection"
) == 0)
+else if (str
ncmpic(pp, US"lost_connection", p - pp
) == 0)
*basic_errno = ERRNO_SMTPCLOSED;
*basic_errno = ERRNO_SMTPCLOSED;
-else if (str
cmpic(pp, US"tls_required"
) == 0)
+else if (str
ncmpic(pp, US"tls_required", p - pp
) == 0)
*basic_errno = ERRNO_TLSREQUIRED;
else if (len != 1 || Ustrncmp(pp, "*", 1) != 0)
*basic_errno = ERRNO_TLSREQUIRED;
else if (len != 1 || Ustrncmp(pp, "*", 1) != 0)
diff --git
a/test/confs/2010
b/test/confs/2010
index c08d4ce4997fe9ca3b107b0b8a9c0a953693218d..2415c685ed74b08b6d6f739ba17b757856f4c6bc 100644
(file)
--- a/
test/confs/2010
+++ b/
test/confs/2010
@@
-1,6
+1,7
@@
# Exim test configuration 2010
SERVER =
# Exim test configuration 2010
SERVER =
+TIMES =
HOSTS = 127.0.0.1 : HOSTIPV4
exim_path = EXIM_PATH
HOSTS = 127.0.0.1 : HOSTIPV4
exim_path = EXIM_PATH
@@
-54,7
+55,7
@@
send_to_server:
begin retry
begin retry
-* tls_required
+* tls_required
TIMES
* * F,1d,5m
# End
* * F,1d,5m
# End
diff --git
a/test/scripts/2000-GnuTLS/2010
b/test/scripts/2000-GnuTLS/2010
index 02c82ea79c771f113a068c2bc262aa8891f493d5..46bd35b5ce2504a64dd7a55e4dd63a0ea9f30f35 100644
(file)
--- 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 userx@test.ex
Test message
****
-exim -qf
+exim -qf
-DTIMES=F,1h,1d
****
exim -DHOSTS=127.0.0.1 -qf
****
****
exim -DHOSTS=127.0.0.1 -qf
****