From: Tom Lane <tgl@sss.pgh.pa.us>
To: pgsql-committers@lists.postgresql.org
Subject: pgsql: contrib/sslinfo needs a fix too to make hamerkop happy.
Date: Sun, 07 Nov 2021 16:34:09 +0000
Message-ID: <E1mjl7R-0000aN-2c@gemulon.postgresql.org> (raw)
contrib/sslinfo needs a fix too to make hamerkop happy.
Re-ordering the #include's is a bit problematic here because
libpq/libpq-be.h needs to include <openssl/ssl.h>. Instead,
let's #undef the unwanted macro after all the #includes.
This is definitely uglier than the other way, but it should
work despite possible future header rearrangements.
(A look at the openssl headers indicates that X509_NAME is the
only conflicting symbol that we use.)
In passing, remove a related but long-incorrect comment in
pg_backup_archiver.h.
Discussion: https://postgr.es/m/1051867.1635720347@sss.pgh.pa.us
Branch
------
master
Details
-------
https://git.postgresql.org/pg/commitdiff/568620dfd6912351b4127435eca5309f823abde8
Modified Files
--------------
contrib/sslinfo/sslinfo.c | 11 +++++++++++
src/bin/pg_dump/pg_backup_archiver.h | 4 ----
2 files changed, 11 insertions(+), 4 deletions(-)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Reply to all the recipients from your mail client; the link fills in
the headers below: reply via email
Some clients, webmail especially, drop In-Reply-To and References from
a link, and the reply then starts a new thread: use the mbox below.
To: pgsql-committers@postgresql.org
Cc: tgl@sss.pgh.pa.us
Subject: Re: pgsql: contrib/sslinfo needs a fix too to make hamerkop happy.
In-Reply-To: <E1mjl7R-0000aN-2c@gemulon.postgresql.org>
References: <E1mjl7R-0000aN-2c@gemulon.postgresql.org>
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
This inbox is served by DDX for PostgreSQL; see mirroring instructions
for how to clone and mirror all data and code used for this inbox