Re: Windows: openssl & gssapi dislike each other

Andrew Dunstan <andrew@dunslane.net>

From: Andrew Dunstan <andrew@dunslane.net>

To: Dave Page <dpage@pgadmin.org>, Imran Zaheer <imran.zhir@gmail.com>

Cc: Tom Lane <tgl@sss.pgh.pa.us>, PostgreSQL Developers <pgsql-hackers@lists.postgresql.org>

Date: 2024-06-11T11:22:18Z

Lists: pgsql-hackers

Commits

Same data as JSON: GET /api/v1/messages/:b64id/commits the thread's linked commits as JSON, with link sources. API reference →

Move GSSAPI includes into its own header
- e92c0632c147 18.0 landed
Tighten test_predtest's input checks, and improve error messages.
- 00ac25a3c365 17.0 cited
Collation documentation fixes.
- 8ba34c698d19 17.0 cited
contrib/sslinfo needs a fix too to make hamerkop happy.
- 568620dfd691 15.0 cited
Second attempt to silence SSL compile failures on hamerkop.
- 1241fcbd7e64 15.0 cited

On 2024-06-11 Tu 05:19, Dave Page wrote:
> Hi
>
> On Sun, 9 Jun 2024 at 08:29, Imran Zaheer <imran.zhir@gmail.com> wrote:
>
>     Hi
>
>     I am submitting two new patches. We can undefine the macro at two
>     locations
>
>     1). As be-secure-openssl.c [1] was the actual
>     file where the conflict happened so I undefined the macro here before
>     the ssl includes. I changed the comment a little to make it
>     understandable.
>     I am also attaching the error generated with ninja build.
>
>     OR
>
>     2). Right after the gssapi includes in libpq-be.h
>
>
> Thank you for working on this. I can confirm the undef version 
> compiles and passes tests with 16.3.
>

Thanks for testing.

I think I prefer approach 2, which should also allow us to remove the 
#undef in sslinfo.c so we only need to do this in one place.


cheers


andrew

--
Andrew Dunstan
EDB:https://www.enterprisedb.com