Fix SCM_CREDS for FreeBSD, from Teodor Sigaev.

bmomjian · bmomjian · commit 8dbaca424fc5 · 2001-08-21T15:49:17.000Z
diff --git 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
@@ -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)

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`*`
`11`	`11`	`*`
`12`	`12`	`* 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 $`
`14`	`14`	`*`
`15`	`15`	`*-------------------------------------------------------------------------`
`16`	`16`	`*/`
`@@ -954,12 +954,12 @@ ident_unix(int sock, char *ident_user)`
`954`	`954`
`955`	`955`	`cred = (Cred *)CMSG_DATA(cmsg);`
`956`	`956`
`957`		`- pw = getpwuid(cred->fc_uid);`
	`957`	`+ pw = getpwuid(cred->cruid);`
`958`	`958`	`if (pw == NULL)`
`959`	`959`	`{`
`960`	`960`	`snprintf(PQerrormsg, PQERRORMSG_LENGTH,`
`961`	`961`	`"ident_unix: unknown local user with uid %d\n",`
`962`		`- cred->fc_uid);`
	`962`	`+ cred->cruid);`
`963`	`963`	`fputs(PQerrormsg, stderr);`
`964`	`964`	`pqdebug("%s", PQerrormsg);`
`965`	`965`	`return false;`