Fix SCM_CREDS for FreeBSD, from Teodor Sigaev.

diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c
index a07501e..9dddb61 100644 (file)
--- 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 2c5ebf0..9438c44 100644 (file)
--- 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)