diff options
| author | Tom Lane | 2021-11-07 16:33:53 +0000 |
|---|---|---|
| committer | Tom Lane | 2021-11-07 16:33:53 +0000 |
| commit | 568620dfd6912351b4127435eca5309f823abde8 (patch) | |
| tree | 6ea533167eeb93288a3c8edc29b22ce0b4beb11e /contrib | |
| parent | 27ef132a805c8633ed8bb94ed70be995c681ab1f (diff) | |
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
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/sslinfo/sslinfo.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/contrib/sslinfo/sslinfo.c b/contrib/sslinfo/sslinfo.c index 30cae0bb98..5fd46b9874 100644 --- a/contrib/sslinfo/sslinfo.c +++ b/contrib/sslinfo/sslinfo.c @@ -19,6 +19,17 @@ #include "miscadmin.h" #include "utils/builtins.h" +/* + * On Windows, <wincrypt.h> includes a #define for X509_NAME, which breaks our + * ability to use OpenSSL's version of that symbol if <wincrypt.h> is pulled + * in after <openssl/ssl.h> ... and, at least on some builds, it is. We + * can't reliably fix that by re-ordering #includes, because libpq/libpq-be.h + * #includes <openssl/ssl.h>. Instead, just zap the #define again here. + */ +#ifdef X509_NAME +#undef X509_NAME +#endif + PG_MODULE_MAGIC; static Datum X509_NAME_field_to_text(X509_NAME *name, text *fieldName); |