From: Magnus Hagander <magnus@hagander.net>
Date: Tue, 11 Nov 2008 15:01:53 +0000 (+0000)
Subject: Make psql report "SSL connection (unknown cipher)" when libpq has set
X-Git-Tag: recoveryinfrav9~382
X-Git-Url: http://git.postgresql.org/gitweb/irc:/static/gitweb.js?a=commitdiff_plain;h=15d00727e979d99419872b2419bcaf65668ae233;p=users%2Fsimon%2Fpostgres.git

Make psql report "SSL connection (unknown cipher)" when libpq has set
up a SSL connection, but psql is compiled without support for it.

Not a really realistic use-case, but the patch also cuts down on
the number of places with #ifdef's...
---

diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c
index 84d372568a..ae10b77688 100644
--- a/src/bin/psql/command.c
+++ b/src/bin/psql/command.c
@@ -64,9 +64,7 @@ static bool lookup_function_oid(PGconn *conn, const char *desc, Oid *foid);
 static bool get_create_function_cmd(PGconn *conn, Oid oid, PQExpBuffer buf);
 static void minimal_error_message(PGresult *res);
 
-#ifdef USE_SSL
 static void printSSLInfo(void);
-#endif
 
 #ifdef WIN32
 static void checkWin32Codepage(void);
@@ -1327,9 +1325,7 @@ connection_warnings(void)
 #ifdef WIN32
 		checkWin32Codepage();
 #endif
-#ifdef USE_SSL
 		printSSLInfo();
-#endif
 	}
 }
 
@@ -1339,10 +1335,10 @@ connection_warnings(void)
  *
  * Prints information about the current SSL connection, if SSL is in use
  */
-#ifdef USE_SSL
 static void
 printSSLInfo(void)
 {
+#ifdef USE_SSL
 	int			sslbits = -1;
 	SSL		   *ssl;
 
@@ -1353,8 +1349,16 @@ printSSLInfo(void)
 	SSL_get_cipher_bits(ssl, &sslbits);
 	printf(_("SSL connection (cipher: %s, bits: %i)\n"),
 		   SSL_get_cipher(ssl), sslbits);
-}
+#else
+	/*
+	 * If psql is compiled without SSL but is using a libpq with SSL,
+	 * we cannot figure out the specifics about the connection. But
+	 * we know it's SSL secured.
+	 */
+	if (PQgetssl(pset.db))
+		printf(_("SSL connection (unknown cipher)\n"));
 #endif
+}
 
 
 /*