diff options
author | Bruce Momjian <bruce@momjian.us> | 2001-08-21 15:49:17 +0000 |
---|---|---|
committer | Bruce Momjian <bruce@momjian.us> | 2001-08-21 15:49:17 +0000 |
commit | 8dbaca424fc53b8504c693b4d7b866113422e049 (patch) | |
tree | a38e127bdca1ce008e07b3c9f13c02545953c1df /src | |
parent | 2a9bfb1f0dd405c63f4bb9e3ee4e38c21682c78b (diff) | |
download | postgresql-8dbaca424fc53b8504c693b4d7b866113422e049.tar.gz postgresql-8dbaca424fc53b8504c693b4d7b866113422e049.zip |
Fix SCM_CREDS for FreeBSD, from Teodor Sigaev.
Diffstat (limited to 'src')
-rw-r--r-- | src/backend/libpq/hba.c | 6 | ||||
-rw-r--r-- | src/interfaces/libpq/fe-auth.c | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c index a07501e391b..9dddb617540 100644 --- a/src/backend/libpq/hba.c +++ b/src/backend/libpq/hba.c @@ -10,7 +10,7 @@ * * * 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); - pw = getpwuid(cred->fc_uid); + pw = getpwuid(cred->cruid); if (pw == NULL) { snprintf(PQerrormsg, PQERRORMSG_LENGTH, "ident_unix: unknown local user with uid %d\n", - cred->fc_uid); + cred->cruid); fputs(PQerrormsg, stderr); pqdebug("%s", PQerrormsg); return false; diff --git a/src/interfaces/libpq/fe-auth.c b/src/interfaces/libpq/fe-auth.c index 2c5ebf0a7ba..9438c442726 100644 --- a/src/interfaces/libpq/fe-auth.c +++ b/src/interfaces/libpq/fe-auth.c @@ -10,7 +10,7 @@ * exceed INITIAL_EXPBUFFER_SIZE (currently 256 bytes). * * 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_controllen = sizeof(cmsgmem); memset(cmsg, 0, sizeof(cmsgmem)); - cmsg.hdr.cmsg_len = sizeof(cmsgmem); - cmsg.hdr.cmsg_level = SOL_SOCKET; - cmsg.hdr.cmsg_type = SCM_CREDS; + cmsg->cmsg_len = sizeof(cmsgmem); + cmsg->cmsg_level = SOL_SOCKET; + cmsg->cmsg_type = SCM_CREDS; #endif if (sendmsg(conn->sock, &msg, 0) == -1) |