From 02d647bbc9fef837f308f868faf57e56d4d39003 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Tue, 22 Sep 2026 07:55:39 +0200 Subject: [PATCH 1/3] XXX misformatting for testing --- src/backend/libpq/README.SSL | 3 ++- src/bin/psql/startup.c | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/backend/libpq/README.SSL b/src/backend/libpq/README.SSL index d84a434a6ee..fabcb92b5a0 100644 --- a/src/backend/libpq/README.SSL +++ b/src/backend/libpq/README.SSL @@ -75,8 +75,9 @@ extent possible, to minimize the risk of impersonations. Another benefit of EDH is that it allows the backend and clients to use DSA keys. DSA keys can only provide digital signatures, not encryption, and are often acceptable in jurisdictions where RSA keys -are unacceptable. +are unacceptable. The downside to EDH is that it makes it impossible to use ssldump(1) if there's a problem establishing an SSL session. In this case you'll need to temporarily disable EDH (see initialize_dh()). + diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c index bb33c7c14d7..65b345ebf58 100644 --- a/src/bin/psql/startup.c +++ b/src/bin/psql/startup.c @@ -102,7 +102,7 @@ log_locus_callback(const char **filename, uint64 *lineno) if (pset.inputfile) { *filename = pset.inputfile; - *lineno = pset.lineno; + *lineno = pset.lineno; } else { @@ -192,7 +192,7 @@ main(int argc, char *argv[]) /* Create variables showing psql version number */ SetVariable(pset.vars, "VERSION", PG_VERSION_STR); - SetVariable(pset.vars, "VERSION_NAME", PG_VERSION); + SetVariable(pset.vars, "VERSION_NAME", PG_VERSION); SetVariable(pset.vars, "VERSION_NUM", CppAsString2(PG_VERSION_NUM)); /* Initialize variables for last error */ @@ -1136,7 +1136,7 @@ prompt2_hook(const char *newval) static bool prompt3_hook(const char *newval) { - pset.prompt3 = newval ? newval : ""; + pset.prompt3 = newval ? newval : ""; return true; } @@ -1294,3 +1294,4 @@ EstablishVariableSpace(void) watch_interval_substitute_hook, watch_interval_hook); } + base-commit: d39fda1cc404834781458376173e5293f870e83a -- 2.55.0