summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMagnus Hagander <magnus@hagander.net>2014-07-15 15:07:38 +0200
committerMagnus Hagander <magnus@hagander.net>2014-07-15 15:12:13 +0200
commitd3c980694fa4523a8aa66b57343f031c4b6b8425 (patch)
tree36b6c9aaf826fd4ae73a431ae457ed0bd5b653d0
parent350651905decd60637e583837d3bb3aa5d9164b6 (diff)
Include SSL compression status in psql banner and connection logging
Both the psql banner and the connection logging already included SSL status, cipher and bitlength, this adds the information about compression being on or off.
-rw-r--r--src/backend/utils/init/postinit.c10
-rw-r--r--src/bin/psql/command.c5
2 files changed, 9 insertions, 6 deletions
diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c
index ed936d7fad8..28243ad58f9 100644
--- a/src/backend/utils/init/postinit.c
+++ b/src/backend/utils/init/postinit.c
@@ -234,8 +234,9 @@ PerformAuthentication(Port *port)
#ifdef USE_SSL
if (port->ssl)
ereport(LOG,
- (errmsg("replication connection authorized: user=%s SSL enabled (protocol=%s, cipher=%s)",
- port->user_name, SSL_get_version(port->ssl), SSL_get_cipher(port->ssl))));
+ (errmsg("replication connection authorized: user=%s SSL enabled (protocol=%s, cipher=%s, compression=%s)",
+ port->user_name, SSL_get_version(port->ssl), SSL_get_cipher(port->ssl),
+ SSL_get_current_compression(port->ssl) ? _("on") : _("off"))));
else
#endif
ereport(LOG,
@@ -247,8 +248,9 @@ PerformAuthentication(Port *port)
#ifdef USE_SSL
if (port->ssl)
ereport(LOG,
- (errmsg("connection authorized: user=%s database=%s SSL enabled (protocol=%s, cipher=%s)",
- port->user_name, port->database_name, SSL_get_version(port->ssl), SSL_get_cipher(port->ssl))));
+ (errmsg("connection authorized: user=%s database=%s SSL enabled (protocol=%s, cipher=%s, compression=%s)",
+ port->user_name, port->database_name, SSL_get_version(port->ssl), SSL_get_cipher(port->ssl),
+ SSL_get_current_compression(port->ssl) ? _("on") : _("off"))));
else
#endif
ereport(LOG,
diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c
index cede72a5d6c..161de75b0ac 100644
--- a/src/bin/psql/command.c
+++ b/src/bin/psql/command.c
@@ -1800,8 +1800,9 @@ printSSLInfo(void)
return; /* no SSL */
SSL_get_cipher_bits(ssl, &sslbits);
- printf(_("SSL connection (protocol: %s, cipher: %s, bits: %d)\n"),
- SSL_get_version(ssl), SSL_get_cipher(ssl), sslbits);
+ printf(_("SSL connection (protocol: %s, cipher: %s, bits: %d, compression: %s)\n"),
+ SSL_get_version(ssl), SSL_get_cipher(ssl), sslbits,
+ SSL_get_current_compression(ssl) ? _("on") : _("off"));
#else
/*