jetmore 2010/06/12 18:56:32 BST
Modified files:
exim-src/src readconf.c tls-openssl.c
Log:
removed extraneous "\n" from the end of some log_write lines, removed "magic" string " => " from a non-delivery log line
Revision Changes Path
1.45 +2 -2 exim/exim-src/src/readconf.c
1.28 +1 -1 exim/exim-src/src/tls-openssl.c
Index: readconf.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/readconf.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- readconf.c 12 Jun 2010 15:21:26 -0000 1.44
+++ readconf.c 12 Jun 2010 17:56:32 -0000 1.45
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/readconf.c,v 1.44 2010/06/12 15:21:26 jetmore Exp $ */
+/* $Cambridge: exim/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 @@
{
# 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
Index: tls-openssl.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/tls-openssl.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- tls-openssl.c 7 Jun 2010 00:12:42 -0000 1.27
+++ tls-openssl.c 12 Jun 2010 17:56:32 -0000 1.28
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/tls-openssl.c,v 1.27 2010/06/07 00:12:42 pdp Exp $ */
+/* $Cambridge: exim/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 @@
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;
}
