From: Alexander Barton <alex@barton.de>
Date: Wed, 23 May 2012 15:08:42 +0000 (+0200)
Subject: Change wording of "TLS initialized" message
X-Git-Tag: rel-19.2-rc1~10
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=commitdiff_plain;h=c0d059cd0ed4403e50820437d9a4cce1648c6b5a

Change wording of "TLS initialized" message

Don't use the word "socket" to identify the connection number, but use the
word "connection" like on all the other messages logged.
---

diff --git a/src/ngircd/conn-ssl.c b/src/ngircd/conn-ssl.c
index ffb1b104..5d44b30f 100644
--- a/src/ngircd/conn-ssl.c
+++ b/src/ngircd/conn-ssl.c
@@ -549,17 +549,18 @@ ConnSSL_LogCertInfo( CONNECTION *c )
 
 	assert(ssl);
 
-	Log(LOG_INFO, "New %s connection using cipher %s on socket %d.",
-		SSL_get_version(ssl), SSL_get_cipher(ssl), c->sock);
+	Log(LOG_INFO, "Connection %d: initialized %s using cipher %s.",
+		c->sock, SSL_get_version(ssl), SSL_get_cipher(ssl));
 #endif
 #ifdef HAVE_LIBGNUTLS
 	gnutls_session_t sess = c->ssl_state.gnutls_session;
 	gnutls_cipher_algorithm_t cipher = gnutls_cipher_get(sess);
 
-	Log(LOG_INFO, "New %s connection using cipher %s-%s on socket %d.",
+	Log(LOG_INFO, "Connection %d: initialized %s using cipher %s-%s.",
+	    c->sock,
 	    gnutls_protocol_get_name(gnutls_protocol_get_version(sess)),
 	    gnutls_cipher_get_name(cipher),
-	    gnutls_mac_get_name(gnutls_mac_get(sess)), c->sock);
+	    gnutls_mac_get_name(gnutls_mac_get(sess)));
 #endif
 }