summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Jetmore <jj33@pobox.com>2010-06-12 17:56:32 +0000
committerJohn Jetmore <jj33@pobox.com>2010-06-12 17:56:32 +0000
commita053d12591b8ef90116feba27d290408a044f813 (patch)
treea39759ecbabc6aadf193de4afe71d91575d8afb9
parent5dc43717a3cf7349094cb552c81e86bc205f9b30 (diff)
removed extraneous "\n" from the end of some log_write lines, removed "magic" string " => " from a non-delivery log line
-rw-r--r--src/src/readconf.c6
-rw-r--r--src/src/tls-openssl.c4
2 files changed, 5 insertions, 5 deletions
diff --git a/src/src/readconf.c b/src/src/readconf.c
index 33f10690b..954d546a4 100644
--- a/src/src/readconf.c
+++ b/src/src/readconf.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/readconf.c,v 1.44 2010/06/12 15:21:26 jetmore Exp $ */
+/* $Cambridge: exim/src/src/readconf.c,v 1.45 2010/06/12 17:56:32 jetmore Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -3207,12 +3207,12 @@ if (openssl_options != NULL)
{
# ifdef USE_GNUTLS
log_write(0, LOG_PANIC_DIE|LOG_CONFIG,
- "openssl_options is set but we're using GnuTLS\n");
+ "openssl_options is set but we're using GnuTLS");
# else
long dummy;
if (!(tls_openssl_options_parse(openssl_options, &dummy)))
log_write(0, LOG_PANIC_DIE|LOG_CONFIG,
- "openssl_options parse error: %s\n", openssl_options);
+ "openssl_options parse error: %s", openssl_options);
# endif
}
#endif
diff --git a/src/src/tls-openssl.c b/src/src/tls-openssl.c
index e01edc008..3ea55f238 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.27 2010/06/07 00:12:42 pdp Exp $ */
+/* $Cambridge: exim/src/src/tls-openssl.c,v 1.28 2010/06/12 17:56:32 jetmore Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -714,7 +714,7 @@ if (rc <= 0)
tls_error(US"SSL_accept", NULL, sigalrm_seen ? US"timed out" : NULL);
if (ERR_get_error() == 0)
log_write(0, LOG_MAIN,
- " => client disconnected cleanly (rejected our certificate?)\n");
+ "TLS client disconnected cleanly (rejected our certificate?)");
return FAIL;
}