From: | Tom Lane <tgl(at)sss(dot)pgh(dot)pa(dot)us> |
---|---|
To: | pgsql-committers(at)lists(dot)postgresql(dot)org |
Subject: | pgsql: contrib/sslinfo needs a fix too to make hamerkop happy. |
Date: | 2021-11-07 16:34:09 |
Message-ID: | E1mjl7R-0000aN-2c@gemulon.postgresql.org |
Views: | Raw Message | Whole Thread | Download mbox | Resend email |
Thread: | |
Lists: | pgsql-committers |
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(-)
From | Date | Subject | |
---|---|---|---|
Next Message | Tom Lane | 2021-11-07 17:18:25 | pgsql: Silence uninitialized-variable warning. |
Previous Message | Tom Lane | 2021-11-07 03:14:43 | Re: pgsql: pgcrypto: Remove non-OpenSSL support |