Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 8dbaca4

Browse files
committed
Fix SCM_CREDS for FreeBSD, from Teodor Sigaev.
1 parent 2a9bfb1 commit 8dbaca4

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

src/backend/libpq/hba.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*
1111
*
1212
* IDENTIFICATION
13-
* $Header: /cvsroot/pgsql/src/backend/libpq/hba.c,v 1.67 2001/08/21 15:21:25 momjian Exp $
13+
* $Header: /cvsroot/pgsql/src/backend/libpq/hba.c,v 1.68 2001/08/21 15:49:17 momjian Exp $
1414
*
1515
*-------------------------------------------------------------------------
1616
*/
@@ -954,12 +954,12 @@ ident_unix(int sock, char *ident_user)
954954

955955
cred = (Cred *)CMSG_DATA(cmsg);
956956

957-
pw = getpwuid(cred->fc_uid);
957+
pw = getpwuid(cred->cruid);
958958
if (pw == NULL)
959959
{
960960
snprintf(PQerrormsg, PQERRORMSG_LENGTH,
961961
"ident_unix: unknown local user with uid %d\n",
962-
cred->fc_uid);
962+
cred->cruid);
963963
fputs(PQerrormsg, stderr);
964964
pqdebug("%s", PQerrormsg);
965965
return false;

src/interfaces/libpq/fe-auth.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* exceed INITIAL_EXPBUFFER_SIZE (currently 256 bytes).
1111
*
1212
* IDENTIFICATION
13-
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-auth.c,v 1.57 2001/08/21 15:21:25 momjian Exp $
13+
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-auth.c,v 1.58 2001/08/21 15:49:17 momjian Exp $
1414
*
1515
*-------------------------------------------------------------------------
1616
*/
@@ -468,9 +468,9 @@ pg_local_sendauth(char *PQerrormsg, PGconn *conn)
468468
msg.msg_control = cmsg;
469469
msg.msg_controllen = sizeof(cmsgmem);
470470
memset(cmsg, 0, sizeof(cmsgmem));
471-
cmsg.hdr.cmsg_len = sizeof(cmsgmem);
472-
cmsg.hdr.cmsg_level = SOL_SOCKET;
473-
cmsg.hdr.cmsg_type = SCM_CREDS;
471+
cmsg->cmsg_len = sizeof(cmsgmem);
472+
cmsg->cmsg_level = SOL_SOCKET;
473+
cmsg->cmsg_type = SCM_CREDS;
474474
#endif
475475

476476
if (sendmsg(conn->sock, &msg, 0) == -1)

0 commit comments

Comments
 (0)