]> git.ipfire.org Git - thirdparty/postgresql.git/commit
contrib/sslinfo needs a fix too to make hamerkop happy.
authorTom Lane <tgl@sss.pgh.pa.us>
Sun, 7 Nov 2021 16:33:53 +0000 (11:33 -0500)
committerTom Lane <tgl@sss.pgh.pa.us>
Sun, 7 Nov 2021 16:33:53 +0000 (11:33 -0500)
commit568620dfd6912351b4127435eca5309f823abde8
tree6ea533167eeb93288a3c8edc29b22ce0b4beb11e
parent27ef132a805c8633ed8bb94ed70be995c681ab1f
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
contrib/sslinfo/sslinfo.c
src/bin/pg_dump/pg_backup_archiver.h