Feedback-ID: i0fe9450f:Fastmail
Date: Sun, 11 Sep 2022 09:28:54 +0900
From: Michael Paquier <michael@paquier.xyz>
To: Justin Pryzby <pryzby@telsasoft.com>
Cc: Thomas Munro <thomas.munro@gmail.com>,
	Andrew Dunstan <andrew@dunslane.net>,
	Daniel Gustafsson <daniel@yesql.se>,
	Juan =?iso-8859-1?Q?Jos=E9_Santamar=EDa?= Flecha
 <juanjo.santamaria@gmail.com>,
	pgsql-hackers@lists.postgresql.org
Subject: Re: Bump MIN_WINNT to 0x0600 (Vista) as minimal runtime in 16~
Message-ID: <Yx0rxpNgDh8tN4XA@paquier.xyz>
References: <YsYkzVnFpV79ZTXU@paquier.xyz>
 <YsZnhwERsDv/LtC7@paquier.xyz>
 <20220826112637.GD2342@telsasoft.com>
 <YwmtHRRoA5gQi7lZ@paquier.xyz>
 <Yw1gZjJjS3BNTlim@paquier.xyz>
 <CA+hUKG+BMdcaCe=P-EjMoLTCr3zrrzqbcVE=8h5LyNsSVHKXZA@mail.gmail.com>
 <YxmuDClnF90gAxxW@paquier.xyz>
 <20220908132920.GG31833@telsasoft.com>
 <YxqdK+bEBOYoeMZI@paquier.xyz>
 <YxsfTdQlZyLq19ag@paquier.xyz>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
	protocol="application/pgp-signature"; boundary="6KnxstKkAH4F9uwY"
Content-Disposition: inline
In-Reply-To: <YxsfTdQlZyLq19ag@paquier.xyz>
Archived-At: 
 <https://www.postgresql.org/message-id/Yx0rxpNgDh8tN4XA%40paquier.xyz>
Precedence: bulk


--6KnxstKkAH4F9uwY
Content-Type: multipart/mixed; boundary="V2kEJ1f8WIr4Qd9O"
Content-Disposition: inline


--V2kEJ1f8WIr4Qd9O
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

On Fri, Sep 09, 2022 at 08:11:09PM +0900, Michael Paquier wrote:
> Based on what I can see, the Windows animals seem to have digested
> 47bd0b3 (cygwin, MinGW and MSVC), so I think that we are good.

The last part that's worth adjusting is ldap_start_tls_sA(), which
would lead to the attached simplification.  The MinGW headers list
this routine, so like the previous change I think that it should be
safe for such builds.

Looking at the buildfarm animals, bowerbird, jacana, fairywren,
lorikeet and drongo disable ldap.  hamerkop is the only member that
provides coverage for it, still that's a MSVC build.

The CI provides coverage for ldap as it is enabled by default and
windows_build_config.pl does not tell otherwise, but with the existing
animals we don't have ldap coverage under MinGW.

Anyway, I'd like to apply the attached, and I don't quite see why it
would not work after 47bd0b3 under MinGW.  Any thoughts?
--
Michael

--V2kEJ1f8WIr4Qd9O
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="win32-ldap-funccall.patch"
Content-Transfer-Encoding: quoted-printable

diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c
index a776bc3ed7..3a10baa9ce 100644
--- a/src/backend/libpq/auth.c
+++ b/src/backend/libpq/auth.c
@@ -135,14 +135,6 @@ static int	CheckBSDAuth(Port *port, char *user);
 #else
 #include <winldap.h>
=20
-/* Correct header from the Platform SDK */
-typedef
-ULONG		(*__ldap_start_tls_sA) (IN PLDAP ExternalHandle,
-									OUT PULONG ServerReturnValue,
-									OUT LDAPMessage **result,
-									IN PLDAPControlA * ServerControls,
-									IN PLDAPControlA * ClientControls
-);
 #endif
=20
 static int	CheckLDAPAuth(Port *port);
@@ -2348,48 +2340,7 @@ InitializeLDAPConnection(Port *port, LDAP **ldap)
 #ifndef WIN32
 		if ((r =3D ldap_start_tls_s(*ldap, NULL, NULL)) !=3D LDAP_SUCCESS)
 #else
-		static __ldap_start_tls_sA _ldap_start_tls_sA =3D NULL;
-
-		if (_ldap_start_tls_sA =3D=3D NULL)
-		{
-			/*
-			 * Need to load this function dynamically because it may not exist
-			 * on Windows, and causes a load error for the whole exe if
-			 * referenced.
-			 */
-			HANDLE		ldaphandle;
-
-			ldaphandle =3D LoadLibrary("WLDAP32.DLL");
-			if (ldaphandle =3D=3D NULL)
-			{
-				/*
-				 * should never happen since we import other files from
-				 * wldap32, but check anyway
-				 */
-				ereport(LOG,
-						(errmsg("could not load library \"%s\": error code %lu",
-								"WLDAP32.DLL", GetLastError())));
-				ldap_unbind(*ldap);
-				return STATUS_ERROR;
-			}
-			_ldap_start_tls_sA =3D (__ldap_start_tls_sA) (pg_funcptr_t) GetProcAddr=
ess(ldaphandle, "ldap_start_tls_sA");
-			if (_ldap_start_tls_sA =3D=3D NULL)
-			{
-				ereport(LOG,
-						(errmsg("could not load function _ldap_start_tls_sA in wldap32.dll"),
-						 errdetail("LDAP over SSL is not supported on this platform.")));
-				ldap_unbind(*ldap);
-				FreeLibrary(ldaphandle);
-				return STATUS_ERROR;
-			}
-
-			/*
-			 * Leak LDAP handle on purpose, because we need the library to
-			 * stay open. This is ok because it will only ever be leaked once
-			 * per process and is automatically cleaned up on process exit.
-			 */
-		}
-		if ((r =3D _ldap_start_tls_sA(*ldap, NULL, NULL, NULL, NULL)) !=3D LDAP_=
SUCCESS)
+		if ((r =3D ldap_start_tls_sA(*ldap, NULL, NULL, NULL, NULL)) !=3D LDAP_S=
UCCESS)
 #endif
 		{
 			ereport(LOG,

--V2kEJ1f8WIr4Qd9O--

--6KnxstKkAH4F9uwY
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQIzBAABCgAdFiEEG72nH6vTowiyblFKnvQgOdbyQH0FAmMdK8YACgkQnvQgOdby
QH1c/RAAlTMNkBRzvY39WCpiJ1ILj20PzmQhgXn3HxPMSNYnZHOHNcoo+ZNxx2DQ
4CwauYPaFEd/12Os2/9NQQStc+MVLyCqz5KDDZ6Z0+YI5F3BiXLEOixaewggyqnF
T7ir3aaRRPh8LcHLPAiMdGC/bG43Mg5MeO0GfdmpCW888HtC9nDBr7x1xRzZYSTO
FQLInM7zuHLAxqCzTdyAckL13YTGt5t+WFd53O9WGyB7tG7AdTKyanJ5XT/PC1gp
4Qjhc24bcBYbzYuT8bpto4/XE+ku+B6Ut4WIlJKS1PXhsRTX8nlxvj85CHQWVT41
4aMKVEL2fss5ftLck/whm/XD5XjOiqLDqgonUpVOGJKb0uLM0VB82xy+CqxiC4of
zydPpQShPrABEwVRdF5lGzmD6vuXCAu88pFNEnrJz+PlZwVdMfxlCDARYGV3Ilhd
v5ctDUf8Wv391slxI/eX1POFwlpg5vT2w4e59HNnz/kbZVPws9eW9Vf3qRjxOoWv
sXsDP2bOFUE1SBE2K9dFgt8Q9a+GSu0aF42VHcWcQNUN3jd8wnSFbdr+20HWXbXU
d0XC8svuTtJLZDaYZgrS3qYrwPErYO0CQ5mvEdT4RAgMD3V7CMvLVxLMzNUWSvkK
pRe5CfVetc6RPxplzfLi+bH/BmzlaYj/6MlBzNL+0pifMEDSNJQ=
=L/45
-----END PGP SIGNATURE-----

--6KnxstKkAH4F9uwY--