Feedback-ID: i0fe9450f:Fastmail
Date: Sat, 27 Aug 2022 14:35:25 +0900
From: Michael Paquier <michael@paquier.xyz>
To: Justin Pryzby <pryzby@telsasoft.com>
Cc: Andrew Dunstan <andrew@dunslane.net>,
	Thomas Munro <thomas.munro@gmail.com>,
	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: <YwmtHRRoA5gQi7lZ@paquier.xyz>
References: <YqFvNnkbYUeP8v2c@paquier.xyz>
 <CA+hUKGKoT-77HwufN6h55NpOdTHU6ukDXWiA0B3NqCn+cmQR7w@mail.gmail.com>
 <YqGJeEYLSMxVfRd4@paquier.xyz>
 <YqrKOPvi/JtS5gzR@paquier.xyz>
 <YsU5fb0ceDADr2Ti@paquier.xyz>
 <CA+hUKGL1p7BHdZc_GEBYkLarPzFEAYKd_HXA_NJ_ct4dJCD-iw@mail.gmail.com>
 <503cc622-ea4d-0a78-ff0c-2c757b97149e@dunslane.net>
 <YsYkzVnFpV79ZTXU@paquier.xyz>
 <YsZnhwERsDv/LtC7@paquier.xyz>
 <20220826112637.GD2342@telsasoft.com>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
	protocol="application/pgp-signature"; boundary="TjfGAIw6f/iOFoJF"
Content-Disposition: inline
In-Reply-To: <20220826112637.GD2342@telsasoft.com>
Archived-At: 
 <https://www.postgresql.org/message-id/YwmtHRRoA5gQi7lZ%40paquier.xyz>
Precedence: bulk


--TjfGAIw6f/iOFoJF
Content-Type: multipart/mixed; boundary="sj1UTf0WjyxXoUPP"
Content-Disposition: inline


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

On Fri, Aug 26, 2022 at 06:26:37AM -0500, Justin Pryzby wrote:
> If I'm not wrong, there's some lingering comments which could be removed since
> 495ed0ef2.

It seems to me that you are right.  I have not thought about looking
at references to NT.  Good catches!

> src/bin/pg_ctl/pg_ctl.c: * on NT4. That way, we don't break on NT4.
> src/bin/pg_ctl/pg_ctl.c: * On NT4, or any other system not containing the required functions, will
> src/bin/pg_ctl/pg_ctl.c:                 * NT4 doesn't have CreateRestrictedToken, so just call ordinary
> src/port/dirmod.c: *    Win32 (NT4 and newer).
> src/backend/port/win32/socket.c:                /* No error, zero bytes (win2000+) or error+WSAEWOULDBLOCK (<=nt4) */

There is also a reference to Nt4 in win32.c, for a comment that is
irrelevant now, so it can be IMO removed.

There may be a point in enforcing CreateProcess() if
CreateRestrictedToken() cannot be loaded, but that would be a security
issue if Windows goes crazy as we should always expect the function,
so this had better return an error.

So, what do you think about the attached?
--
Michael

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

diff --git a/src/backend/port/win32/socket.c b/src/backend/port/win32/socke=
t.c
index 52944a0d33..130b60af22 100644
--- a/src/backend/port/win32/socket.c
+++ b/src/backend/port/win32/socket.c
@@ -495,7 +495,7 @@ pgwin32_send(SOCKET s, const void *buf, int len, int fl=
ags)
 			return -1;
 		}
=20
-		/* No error, zero bytes (win2000+) or error+WSAEWOULDBLOCK (<=3Dnt4) */
+		/* No error, zero bytes */
=20
 		if (pgwin32_waitforsinglesocket(s, FD_WRITE | FD_CLOSE, INFINITE) =3D=3D=
 0)
 			return -1;
diff --git a/src/port/dirmod.c b/src/port/dirmod.c
index 2818bfd2e9..ae6301dd6c 100644
--- a/src/port/dirmod.c
+++ b/src/port/dirmod.c
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *	This includes replacement versions of functions that work on
- *	Win32 (NT4 and newer).
+ *	Windows.
  *
  * IDENTIFICATION
  *	  src/port/dirmod.c
diff --git a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c
index 73e20081d1..20d2a04b7f 100644
--- a/src/bin/pg_ctl/pg_ctl.c
+++ b/src/bin/pg_ctl/pg_ctl.c
@@ -1726,9 +1726,7 @@ pgwin32_doRunAsService(void)
=20
 /*
  * Mingw headers are incomplete, and so are the libraries. So we have to l=
oad
- * a whole lot of API functions dynamically. Since we have to do this anyw=
ay,
- * also load the couple of functions that *do* exist in mingw headers but =
not
- * on NT4. That way, we don't break on NT4.
+ * a whole lot of API functions dynamically.
  */
 typedef BOOL (WINAPI * __CreateRestrictedToken) (HANDLE, DWORD, DWORD, PSI=
D_AND_ATTRIBUTES, DWORD, PLUID_AND_ATTRIBUTES, DWORD, PSID_AND_ATTRIBUTES, =
PHANDLE);
 typedef BOOL (WINAPI * __IsProcessInJob) (HANDLE, HANDLE, PBOOL);
@@ -1768,9 +1766,6 @@ InheritStdHandles(STARTUPINFO *si)
  *
  * Returns 0 on success, non-zero on failure, same as CreateProcess().
  *
- * On NT4, or any other system not containing the required functions, will
- * launch the process under the current token without doing any modificati=
ons.
- *
  * NOTE! Job object will only work when running as a service, because it's
  * automatically destroyed when pg_ctl exits.
  */
@@ -1815,14 +1810,9 @@ CreateRestrictedProcess(char *cmd, PROCESS_INFORMATI=
ON *processInfo, bool as_ser
=20
 	if (_CreateRestrictedToken =3D=3D NULL)
 	{
-		/*
-		 * NT4 doesn't have CreateRestrictedToken, so just call ordinary
-		 * CreateProcess
-		 */
-		write_stderr(_("%s: WARNING: cannot create restricted tokens on this pla=
tform\n"), progname);
-		if (Advapi32Handle !=3D NULL)
-			FreeLibrary(Advapi32Handle);
-		return CreateProcess(NULL, cmd, NULL, NULL, FALSE, 0, NULL, NULL, &si, p=
rocessInfo);
+		/* Log error if we cannot get the function */
+		write_stderr(_("%s: WARNING: could not locate object function to create =
restricted token\n"), progname);
+		return 0;
 	}
=20
 	/* Open the current token to use as a base for the restricted one */
diff --git a/src/interfaces/libpq/win32.c b/src/interfaces/libpq/win32.c
index e57b602476..447f64c072 100644
--- a/src/interfaces/libpq/win32.c
+++ b/src/interfaces/libpq/win32.c
@@ -271,10 +271,6 @@ struct MessageDLL
  * Returns a description of the socket error by first trying
  * to find it in the lookup table, and if that fails, tries
  * to load any of the winsock dlls to find that message.
- * The DLL thing works from Nt4 (spX ?) up, but some special
- * versions of winsock might have this as well (seen on Win98 SE
- * special install)			   / Magnus Naeslund (mag@fbab.net)
- *
  */
=20
 const char *

--sj1UTf0WjyxXoUPP--

--TjfGAIw6f/iOFoJF
Content-Type: application/pgp-signature; name="signature.asc"

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

iQIzBAABCgAdFiEEG72nH6vTowiyblFKnvQgOdbyQH0FAmMJrRwACgkQnvQgOdby
QH2yEg//R90bturBtOIR35puzNo7xPwpdUHOlB4A1Hr+0DWglJwnx5jDSOkFdraX
oJPj9g9CWeTMxNI+TpDA+QCDfrGkbXLeshsysbAmL7op6tpPCWh5DNgN7L0FAB9z
9oXiF5Gu0SzOWBHntAzhuicmP+D84zjKbwlmUJTvWAi7SGKO/U9TmysptAKeyKHz
a1KpoRSrfNqqXB4gInb+tfahdgdxK/ZUoL4kmcx4BZFPHX95zj7Ejkev0oL/szm1
GYgvnARloL4tVp1/WFNKT+rHEQqoX9/KVKEqhdDrzMbu5Z+D2KHLrl+63pgFQu/G
kKsxyNvyGNGT90edPIF3sdBdNzhgGMlNzyySaCPz1iCKDdPvrlWPTVlledWmqarq
sNP0fzHH8HpTaOwunN9LPyAvE6mLs3SE7ILBBYxpzuIruI1bvCDydBMe56qlDMZO
zRsWbrBJDg+pTKNxDZyijyOLSLuknhyzWSAuxiWfzWJnDWZftuh5hlqSDnZ7+pJq
ioT54HdY1yy/cQUpQxLNN+nmjRYYnPsJenpD0nXT+DwIFWqY86D3X30W494kpQUN
yjKqWPq98Zs1uqD7aQXjRcYaOHvlFj7plTyeq7hC96oZ9eu38FqN7jmQE+QvSndP
VSMPZWv6k/TGmE3eBIGxNuxuqq7HGfT0m1yLZkH7HsR2U3T6RXc=
=VM5H
-----END PGP SIGNATURE-----

--TjfGAIw6f/iOFoJF--