Commit8dbaca4

committed

Fix SCM_CREDS for FreeBSD, from Teodor Sigaev.

1 parent2a9bfb1 commit8dbaca4Copy full SHA for 8dbaca4

File tree

-7

lines changed

-7

lines changed

Lines changed: 3 additions & 3 deletions

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;`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`* exceed INITIAL_EXPBUFFER_SIZE (currently 256 bytes).`
`11`	`11`	`*`
`12`	`12`	`* 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 $`
`14`	`14`	`*`
`15`	`15`	`*-------------------------------------------------------------------------`
`16`	`16`	`*/`
`@@ -468,9 +468,9 @@ pg_local_sendauth(char PQerrormsg, PGconn conn)`
`468`	`468`	`msg.msg_control=cmsg;`
`469`	`469`	`msg.msg_controllen=sizeof(cmsgmem);`
`470`	`470`	`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;`
`474`	`474`	`#endif`
`475`	`475`
`476`	`476`	`if (sendmsg(conn->sock,&msg,0)==-1)`

Comments

(0)