Fix SCM_CREDS for FreeBSD, from Teodor Sigaev.
This commit is contained in:
parent
2a9bfb1f0d
commit
8dbaca424f
|
@ -10,7 +10,7 @@
|
||||||
*
|
*
|
||||||
*
|
*
|
||||||
* IDENTIFICATION
|
* IDENTIFICATION
|
||||||
* $Header: /cvsroot/pgsql/src/backend/libpq/hba.c,v 1.67 2001/08/21 15:21:25 momjian Exp $
|
* $Header: /cvsroot/pgsql/src/backend/libpq/hba.c,v 1.68 2001/08/21 15:49:17 momjian Exp $
|
||||||
*
|
*
|
||||||
*-------------------------------------------------------------------------
|
*-------------------------------------------------------------------------
|
||||||
*/
|
*/
|
||||||
|
@ -954,12 +954,12 @@ ident_unix(int sock, char *ident_user)
|
||||||
|
|
||||||
cred = (Cred *)CMSG_DATA(cmsg);
|
cred = (Cred *)CMSG_DATA(cmsg);
|
||||||
|
|
||||||
pw = getpwuid(cred->fc_uid);
|
pw = getpwuid(cred->cruid);
|
||||||
if (pw == NULL)
|
if (pw == NULL)
|
||||||
{
|
{
|
||||||
snprintf(PQerrormsg, PQERRORMSG_LENGTH,
|
snprintf(PQerrormsg, PQERRORMSG_LENGTH,
|
||||||
"ident_unix: unknown local user with uid %d\n",
|
"ident_unix: unknown local user with uid %d\n",
|
||||||
cred->fc_uid);
|
cred->cruid);
|
||||||
fputs(PQerrormsg, stderr);
|
fputs(PQerrormsg, stderr);
|
||||||
pqdebug("%s", PQerrormsg);
|
pqdebug("%s", PQerrormsg);
|
||||||
return false;
|
return false;
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
* exceed INITIAL_EXPBUFFER_SIZE (currently 256 bytes).
|
* exceed INITIAL_EXPBUFFER_SIZE (currently 256 bytes).
|
||||||
*
|
*
|
||||||
* IDENTIFICATION
|
* IDENTIFICATION
|
||||||
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-auth.c,v 1.57 2001/08/21 15:21:25 momjian Exp $
|
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-auth.c,v 1.58 2001/08/21 15:49:17 momjian Exp $
|
||||||
*
|
*
|
||||||
*-------------------------------------------------------------------------
|
*-------------------------------------------------------------------------
|
||||||
*/
|
*/
|
||||||
|
@ -468,9 +468,9 @@ pg_local_sendauth(char *PQerrormsg, PGconn *conn)
|
||||||
msg.msg_control = cmsg;
|
msg.msg_control = cmsg;
|
||||||
msg.msg_controllen = sizeof(cmsgmem);
|
msg.msg_controllen = sizeof(cmsgmem);
|
||||||
memset(cmsg, 0, sizeof(cmsgmem));
|
memset(cmsg, 0, sizeof(cmsgmem));
|
||||||
cmsg.hdr.cmsg_len = sizeof(cmsgmem);
|
cmsg->cmsg_len = sizeof(cmsgmem);
|
||||||
cmsg.hdr.cmsg_level = SOL_SOCKET;
|
cmsg->cmsg_level = SOL_SOCKET;
|
||||||
cmsg.hdr.cmsg_type = SCM_CREDS;
|
cmsg->cmsg_type = SCM_CREDS;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (sendmsg(conn->sock, &msg, 0) == -1)
|
if (sendmsg(conn->sock, &msg, 0) == -1)
|
||||||
|
|
Loading…
Reference in New Issue