psql: Change new \conninfo to use SSL instead of TLS

Commit bba2fbc6238 introduced a new implementation of the \conninfo
command in psql.  That new code uses the term "TLS" while the rest of
PostgreSQL, including the rest of psql, consistently uses "SSL".  This
is uselessly confusing.  This changes the new code to use "SSL" as
well.

Reviewed-by: Alvaro Herrera <alvherre@alvh.no-ip.org>
Discussion: https://www.postgresql.org/message-id/f4ff9294-b491-4053-83f5-11c10ab8c999@eisentraut.org

diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml
index 15e3f3a849226bc1218a5e7cd147dd7819283e86..570ef21d1fce3abe70eae8eafb9ff4678641174a 100644 (file)
--- a/doc/src/sgml/ref/psql-ref.sgml
+++ b/doc/src/sgml/ref/psql-ref.sgml
@@ -1101,7 +1101,7 @@ SELECT $1 \parse stmt1
         <listitem>
          <para>
           Outputs information about the current database connection,
-          including TLS-related information if TLS is in use.
+          including SSL-related information if SSL is in use.
          </para>
          <para>
           Note that the <structfield>Client User</structfield> field shows

diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c
index 1f7635d0c235c675b5e0a90fcf3cb3aa19bd1e51..e26c010d044ee23d095c5723eaa7221fe29b651e 100644 (file)
--- a/src/bin/psql/command.c
+++ b/src/bin/psql/command.c
@@ -877,11 +877,11 @@ exec_command_conninfo(PsqlScanState scan_state, bool active_branch)
    printTableAddCell(&cont, _("Backend PID"), false, false);
    printTableAddCell(&cont, backend_pid, false, false);
 
-   /* TLS Connection */
-   printTableAddCell(&cont, _("TLS Connection"), false, false);
+   /* SSL Connection */
+   printTableAddCell(&cont, _("SSL Connection"), false, false);
    printTableAddCell(&cont, ssl_in_use ? _("true") : _("false"), false, false);
 
-   /* TLS Information */
+   /* SSL Information */
    if (ssl_in_use)
    {
        char       *library,
@@ -898,19 +898,19 @@ exec_command_conninfo(PsqlScanState scan_state, bool active_branch)
        compression = (char *) PQsslAttribute(pset.db, "compression");
        alpn = (char *) PQsslAttribute(pset.db, "alpn");
 
-       printTableAddCell(&cont, _("TLS Library"), false, false);
+       printTableAddCell(&cont, _("SSL Library"), false, false);
        printTableAddCell(&cont, library ? library : _("unknown"), false, false);
 
-       printTableAddCell(&cont, _("TLS Protocol"), false, false);
+       printTableAddCell(&cont, _("SSL Protocol"), false, false);
        printTableAddCell(&cont, protocol ? protocol : _("unknown"), false, false);
 
-       printTableAddCell(&cont, _("TLS Key Bits"), false, false);
+       printTableAddCell(&cont, _("SSL Key Bits"), false, false);
        printTableAddCell(&cont, key_bits ? key_bits : _("unknown"), false, false);
 
-       printTableAddCell(&cont, _("TLS Cipher"), false, false);
+       printTableAddCell(&cont, _("SSL Cipher"), false, false);
        printTableAddCell(&cont, cipher ? cipher : _("unknown"), false, false);
 
-       printTableAddCell(&cont, _("TLS Compression"), false, false);
+       printTableAddCell(&cont, _("SSL Compression"), false, false);
        printTableAddCell(&cont, (compression && strcmp(compression, "off") != 0) ?
                          _("true") : _("false"), false, false);