mirror of
https://github.com/postgres/postgres.git
synced 2025-07-15 19:21:59 +03:00
Sort out getpeereid() and peer auth handling on Windows
The getpeereid() uses have so far been protected by HAVE_UNIX_SOCKETS, so they didn't ever care about Windows support. But in anticipation of Unix-domain socket support on Windows, that needs to be handled differently. Windows doesn't support getpeereid() at this time, so we use the existing not-supported code path. We let configure do its usual thing of picking up the replacement from libpgport, instead of the custom overrides that it was doing before. But then Windows doesn't have struct passwd, so this patch sprinkles some additional #ifdef WIN32 around to make it work. This is similar to existing code that deals with this issue. Reviewed-by: Andrew Dunstan <andrew.dunstan@2ndquadrant.com> Discussion: https://www.postgresql.org/message-id/5974caea-1267-7708-40f2-6009a9d653b0@2ndquadrant.com
This commit is contained in:
@ -2733,8 +2733,6 @@ keep_going: /* We will come back to here until there is
|
||||
char *startpacket;
|
||||
int packetlen;
|
||||
|
||||
#ifdef HAVE_UNIX_SOCKETS
|
||||
|
||||
/*
|
||||
* Implement requirepeer check, if requested and it's a
|
||||
* Unix-domain socket.
|
||||
@ -2742,10 +2740,12 @@ keep_going: /* We will come back to here until there is
|
||||
if (conn->requirepeer && conn->requirepeer[0] &&
|
||||
IS_AF_UNIX(conn->raddr.addr.ss_family))
|
||||
{
|
||||
#ifndef WIN32
|
||||
char pwdbuf[BUFSIZ];
|
||||
struct passwd pass_buf;
|
||||
struct passwd *pass;
|
||||
int passerr;
|
||||
#endif
|
||||
uid_t uid;
|
||||
gid_t gid;
|
||||
|
||||
@ -2766,6 +2766,7 @@ keep_going: /* We will come back to here until there is
|
||||
goto error_return;
|
||||
}
|
||||
|
||||
#ifndef WIN32
|
||||
passerr = pqGetpwuid(uid, &pass_buf, pwdbuf, sizeof(pwdbuf), &pass);
|
||||
if (pass == NULL)
|
||||
{
|
||||
@ -2788,8 +2789,11 @@ keep_going: /* We will come back to here until there is
|
||||
conn->requirepeer, pass->pw_name);
|
||||
goto error_return;
|
||||
}
|
||||
#else /* WIN32 */
|
||||
/* should have failed with ENOSYS above */
|
||||
Assert(false);
|
||||
#endif /* WIN32 */
|
||||
}
|
||||
#endif /* HAVE_UNIX_SOCKETS */
|
||||
|
||||
if (IS_AF_UNIX(conn->raddr.addr.ss_family))
|
||||
{
|
||||
|
Reference in New Issue
Block a user