rdelaage/postgresql
1
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-10-01 02:51:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix up poor handling of unsupported-platform case in requirepeer patch.

Browse Source
This commit is contained in:
Tom Lane 2010-07-18 17:08:11 +00:00
parent 25241aee60
commit 1b51018afc
1 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/interfaces/libpq/fe-connect.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.401 2010/07/18 16:42:20 tgl Exp $ * $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.402 2010/07/18 17:08:11 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -1751,15 +1751,15 @@ keep_going: /* We will come back to here until there is
char *startpacket; char *startpacket;
int packetlen; int packetlen;
#ifdef HAVE_UNIX_SOCKETS if (conn->requirepeer && conn->requirepeer[0])
if (conn->requirepeer)
{ {
#if defined(HAVE_GETPEEREID) || defined(SO_PEERCRED) || defined(HAVE_GETPEERUCRED)
char pwdbuf[BUFSIZ]; char pwdbuf[BUFSIZ];
struct passwd pass_buf; struct passwd pass_buf;
struct passwd *pass; struct passwd *pass;
uid_t uid; uid_t uid;
# if defined(HAVE_GETPEEREID) #if defined(HAVE_GETPEEREID)
gid_t gid; gid_t gid;
errno = 0; errno = 0;
@ -1770,12 +1770,13 @@ keep_going: /* We will come back to here until there is
pqStrerror(errno, sebuf, sizeof(sebuf))); pqStrerror(errno, sebuf, sizeof(sebuf)));
goto error_return; goto error_return;
} }
# elif defined(SO_PEERCRED) #elif defined(SO_PEERCRED)
struct ucred peercred; struct ucred peercred;
ACCEPT_TYPE_ARG3 so_len = sizeof(peercred); ACCEPT_TYPE_ARG3 so_len = sizeof(peercred);
errno = 0; errno = 0;
if (getsockopt(conn->sock, SOL_SOCKET, SO_PEERCRED, &peercred, &so_len) != 0 || if (getsockopt(conn->sock, SOL_SOCKET, SO_PEERCRED,
&peercred, &so_len) != 0 ||
so_len != sizeof(peercred)) so_len != sizeof(peercred))
{ {
appendPQExpBuffer(&conn->errorMessage, appendPQExpBuffer(&conn->errorMessage,
@ -1784,7 +1785,7 @@ keep_going: /* We will come back to here until there is
goto error_return; goto error_return;
} }
uid = peercred.uid; uid = peercred.uid;
# elif defined(HAVE_GETPEERUCRED) #elif defined(HAVE_GETPEERUCRED)
ucred_t *ucred; ucred_t *ucred;
ucred = NULL; /* must be initialized to NULL */ ucred = NULL; /* must be initialized to NULL */
@ -1805,35 +1806,33 @@ keep_going: /* We will come back to here until there is
goto error_return; goto error_return;
} }
ucred_free(ucred); ucred_free(ucred);
# else #else
appendPQExpBuffer(&conn->errorMessage, #error missing implementation method for requirepeer
libpq_gettext("requirepeer parameter is not supported on this platform\n")); #endif
goto error_return;
# endif
pqGetpwuid(uid, &pass_buf, pwdbuf, sizeof(pwdbuf), &pass); pqGetpwuid(uid, &pass_buf, pwdbuf, sizeof(pwdbuf), &pass);
if (pass == NULL) if (pass == NULL)
{ {
appendPQExpBuffer(&conn->errorMessage, appendPQExpBuffer(&conn->errorMessage,
# if defined(SO_PEERCRED)
libpq_gettext("local user with ID %d does not exist\n"), libpq_gettext("local user with ID %d does not exist\n"),
(int) peercred.uid); (int) uid);
#else
libpq_gettext("matching local user does not exist\n"));
#endif
goto error_return; goto error_return;
} }
if (strcmp(pass->pw_name, conn->requirepeer) != 0) if (strcmp(pass->pw_name, conn->requirepeer) != 0)
{ {
appendPQExpBuffer(&conn->errorMessage, appendPQExpBuffer(&conn->errorMessage,
libpq_gettext("requirepeer failed (actual: %s != required: %s)\n"), libpq_gettext("requirepeer specifies \"%s\", but actual peer user name is \"%s\"\n"),
pass->pw_name, conn->requirepeer); conn->requirepeer, pass->pw_name);
goto error_return; goto error_return;
} }
#else /* can't support requirepeer */
appendPQExpBuffer(&conn->errorMessage,
libpq_gettext("requirepeer parameter is not supported on this platform\n"));
goto error_return;
#endif
} }
#endif /* HAVE_UNIX_SOCKETS */
#ifdef USE_SSL #ifdef USE_SSL