diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/port/win32/socket.c | 2 | ||||
| -rw-r--r-- | src/bin/pg_ctl/pg_ctl.c | 19 | ||||
| -rw-r--r-- | src/interfaces/libpq/win32.c | 4 | ||||
| -rw-r--r-- | src/port/dirmod.c | 2 |
4 files changed, 7 insertions, 20 deletions
diff --git a/src/backend/port/win32/socket.c b/src/backend/port/win32/socket.c index 52944a0d332..130b60af223 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 flags) return -1; } - /* No error, zero bytes (win2000+) or error+WSAEWOULDBLOCK (<=nt4) */ + /* No error, zero bytes */ if (pgwin32_waitforsinglesocket(s, FD_WRITE | FD_CLOSE, INFINITE) == 0) return -1; diff --git a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c index d7ff3902aa7..bea2470d866 100644 --- a/src/bin/pg_ctl/pg_ctl.c +++ b/src/bin/pg_ctl/pg_ctl.c @@ -1726,9 +1726,7 @@ pgwin32_doRunAsService(void) /* * Mingw headers are incomplete, and so are the libraries. So we have to load - * a whole lot of API functions dynamically. Since we have to do this anyway, - * 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, PSID_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 modifications. - * * NOTE! Job object will only work when running as a service, because it's * automatically destroyed when pg_ctl exits. */ @@ -1815,14 +1810,10 @@ CreateRestrictedProcess(char *cmd, PROCESS_INFORMATION *processInfo, bool as_ser if (_CreateRestrictedToken == NULL) { - /* - * NT4 doesn't have CreateRestrictedToken, so just call ordinary - * CreateProcess - */ - write_stderr(_("%s: WARNING: cannot create restricted tokens on this platform\n"), progname); - if (Advapi32Handle != NULL) - FreeLibrary(Advapi32Handle); - return CreateProcess(NULL, cmd, NULL, NULL, FALSE, 0, NULL, NULL, &si, processInfo); + /* Log error if we cannot get the function */ + write_stderr(_("%s: could not locate object function to create restricted token: error code %lu\n"), + progname, (unsigned long) GetLastError()); + return 0; } /* 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 e57b602476b..447f64c0726 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) - * */ const char * diff --git a/src/port/dirmod.c b/src/port/dirmod.c index 2818bfd2e95..ae6301dd6cc 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 |