Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit6d64800

Browse files
committed
psql: Change new \conninfo to use SSL instead of TLS
Commitbba2fbc introduced a new implementation of the \conninfocommand in psql. That new code uses the term "TLS" while the rest ofPostgreSQL, including the rest of psql, consistently uses "SSL". Thisis uselessly confusing. This changes the new code to use "SSL" aswell.Reviewed-by: Alvaro Herrera <alvherre@alvh.no-ip.org>Discussion:https://www.postgresql.org/message-id/f4ff9294-b491-4053-83f5-11c10ab8c999@eisentraut.org
1 parent2f98f96 commit6d64800

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

‎doc/src/sgml/ref/psql-ref.sgml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1101,7 +1101,7 @@ SELECT $1 \parse stmt1
11011101
<listitem>
11021102
<para>
11031103
Outputs information about the current database connection,
1104-
includingTLS-related information ifTLS is in use.
1104+
includingSSL-related information ifSSL is in use.
11051105
</para>
11061106
<para>
11071107
Note that the <structfield>Client User</structfield> field shows

‎src/bin/psql/command.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -877,11 +877,11 @@ exec_command_conninfo(PsqlScanState scan_state, bool active_branch)
877877
printTableAddCell(&cont,_("Backend PID"), false, false);
878878
printTableAddCell(&cont,backend_pid, false, false);
879879

880-
/*TLS Connection */
881-
printTableAddCell(&cont,_("TLS Connection"), false, false);
880+
/*SSL Connection */
881+
printTableAddCell(&cont,_("SSL Connection"), false, false);
882882
printTableAddCell(&cont,ssl_in_use ?_("true") :_("false"), false, false);
883883

884-
/*TLS Information */
884+
/*SSL Information */
885885
if (ssl_in_use)
886886
{
887887
char*library,
@@ -898,19 +898,19 @@ exec_command_conninfo(PsqlScanState scan_state, bool active_branch)
898898
compression= (char*)PQsslAttribute(pset.db,"compression");
899899
alpn= (char*)PQsslAttribute(pset.db,"alpn");
900900

901-
printTableAddCell(&cont,_("TLS Library"), false, false);
901+
printTableAddCell(&cont,_("SSL Library"), false, false);
902902
printTableAddCell(&cont,library ?library :_("unknown"), false, false);
903903

904-
printTableAddCell(&cont,_("TLS Protocol"), false, false);
904+
printTableAddCell(&cont,_("SSL Protocol"), false, false);
905905
printTableAddCell(&cont,protocol ?protocol :_("unknown"), false, false);
906906

907-
printTableAddCell(&cont,_("TLS Key Bits"), false, false);
907+
printTableAddCell(&cont,_("SSL Key Bits"), false, false);
908908
printTableAddCell(&cont,key_bits ?key_bits :_("unknown"), false, false);
909909

910-
printTableAddCell(&cont,_("TLS Cipher"), false, false);
910+
printTableAddCell(&cont,_("SSL Cipher"), false, false);
911911
printTableAddCell(&cont,cipher ?cipher :_("unknown"), false, false);
912912

913-
printTableAddCell(&cont,_("TLS Compression"), false, false);
913+
printTableAddCell(&cont,_("SSL Compression"), false, false);
914914
printTableAddCell(&cont, (compression&&strcmp(compression,"off")!=0) ?
915915
_("true") :_("false"), false, false);
916916

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp