Skip to content

[pull] master from postgres:master #966

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 15, 2025
Merged

[pull] master from postgres:master #966

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion doc/src/sgml/ref/psql-ref.sgml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 8 additions & 8 deletions src/bin/psql/command.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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);

Expand Down