summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPhilip Hazel <ph10@hermes.cam.ac.uk>2007-03-13 09:50:22 +0000
committerPhilip Hazel <ph10@hermes.cam.ac.uk>2007-03-13 09:50:22 +0000
commit58c01c94580386541799bcfd22e2cd3e09f3880a (patch)
tree1c2a3055ab76c316d248ab1bf218ed0e4e7efc5b /src
parent57c2c6316b8b5f3ef868eb2e8091ab2d85540e0d (diff)
Fix compiling problems with OpenSSL 0.9.8e.
Diffstat (limited to 'src')
-rw-r--r--src/ACKNOWLEDGMENTS5
-rw-r--r--src/src/tls-openssl.c5
2 files changed, 5 insertions, 5 deletions
diff --git a/src/ACKNOWLEDGMENTS b/src/ACKNOWLEDGMENTS
index 99ace3554..4172a5b0e 100644
--- a/src/ACKNOWLEDGMENTS
+++ b/src/ACKNOWLEDGMENTS
@@ -1,4 +1,4 @@
-$Cambridge: exim/src/ACKNOWLEDGMENTS,v 1.74 2007/03/01 14:06:56 ph10 Exp $
+$Cambridge: exim/src/ACKNOWLEDGMENTS,v 1.75 2007/03/13 09:50:22 ph10 Exp $
EXIM ACKNOWLEDGEMENTS
@@ -20,7 +20,7 @@ relatively small patches.
Philip Hazel
Lists created: 20 November 2002
-Last updated: 01 March 2007
+Last updated: 13 March 2007
THE OLD LIST
@@ -162,6 +162,7 @@ Steve Haslam Lots of stuff, including
HMAC computations
Better error messages for BDB
Sheldon Hearn Suggested patch for smtp_accept_max_nonmail_hosts
+ Fix for compile error with OpenSSL 0.9.8e
Bryan Henderson Patch to use RM_COMMAND everywhere during building
Jakob Hirsch Patch for % operator
Patch for arbitrarily named ACL variables
diff --git a/src/src/tls-openssl.c b/src/src/tls-openssl.c
index 1ae725b86..85f4e15fe 100644
--- a/src/src/tls-openssl.c
+++ b/src/src/tls-openssl.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/tls-openssl.c,v 1.10 2007/01/18 15:35:42 ph10 Exp $ */
+/* $Cambridge: exim/src/src/tls-openssl.c,v 1.11 2007/03/13 09:50:22 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -343,8 +343,7 @@ if (!RAND_status())
/* Set up the information callback, which outputs if debugging is at a suitable
level. */
-if (!(SSL_CTX_set_info_callback(ctx, (void (*)())info_callback)))
- return tls_error(US"SSL_CTX_set_info_callback", host);
+SSL_CTX_set_info_callback(ctx, (void (*)())info_callback);
/* The following patch was supplied by Robert Roselius */