Commit6f0ebe3

committed

Deal with cases where getpeereid _and_ another creditial method is

supported.

1 parentf988edb commit6f0ebe3Copy full SHA for 6f0ebe3

File tree

-4

lines changed

-4

lines changed

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.91 2002/09/04 23:31:34 tgl Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.92 2002/12/03 22:09:19 momjian Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -430,7 +430,9 @@ ClientAuthentication(Port *port)`
`430`	`430`	`break;`
`431`	`431`
`432`	`432`	`caseuaIdent:`
`433`		`-#if !defined(SO_PEERCRED)&& (defined(HAVE_STRUCT_CMSGCRED)\|\| defined(HAVE_STRUCT_FCRED)\|\| (defined(HAVE_STRUCT_SOCKCRED)&& defined(LOCAL_CREDS)))`
	`433`	`+#if defined(HAVE_STRUCT_CMSGCRED)\|\| defined(HAVE_STRUCT_FCRED)\|\| \`
	`434`	`+(defined(HAVE_STRUCT_SOCKCRED)&& defined(LOCAL_CREDS))&& \`
	`435`	`+!defined(HAVE_GETPEEREID)&& !defined(SO_PEERCRED)`
`434`	`436`
`435`	`437`	`/*`
`436`	`438`	`* If we are doing ident on unix-domain sockets, use SCM_CREDS`

Lines changed: 4 additions & 2 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.71 2002/09/04 20:31:46 momjian Exp $`
	`13`	`+ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-auth.c,v 1.72 2002/12/03 22:09:20 momjian Exp $`
`14`	`14`	`*`
`15`	`15`	`*-------------------------------------------------------------------------`
`16`	`16`	`*/`
`@@ -449,7 +449,9 @@ pg_krb5_sendauth(char *PQerrormsg, int sock,`
`449`	`449`	`staticint`
`450`	`450`	`pg_local_sendauth(charPQerrormsg,PGconnconn)`
`451`	`451`	`{`
`452`		`-#if defined(HAVE_STRUCT_CMSGCRED)\|\| defined(HAVE_STRUCT_FCRED)\|\| (defined(HAVE_STRUCT_SOCKCRED)&& defined(LOCAL_CREDS))`
	`452`	`+#if defined(HAVE_STRUCT_CMSGCRED)\|\| defined(HAVE_STRUCT_FCRED)\|\| \`
	`453`	`+(defined(HAVE_STRUCT_SOCKCRED)&& defined(LOCAL_CREDS))&& \`
	`454`	`+!defined(HAVE_GETPEEREID)&& !defined(SO_PEERCRED)`
`453`	`455`	`charbuf;`
`454`	`456`	`structioveciov;`
`455`	`457`	`structmsghdrmsg;`

Comments

(0)