repo: ngircd
action: commit
revision: 
path_from: 
revision_from: c0d059cd0ed4403e50820437d9a4cce1648c6b5a:
path_to: 
revision_to: 

commit c0d059cd0ed4403e50820437d9a4cce1648c6b5a
Author: Alexander Barton 
Date:   Wed May 23 17:08:42 2012 +0200

    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

--- 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
 }

-----END OF PAGE-----