diff options
| author | Bruce Momjian <bruce@momjian.us> | 2002-12-03 22:09:20 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2002-12-03 22:09:20 +0000 |
| commit | 6f0ebe3fba35341e9e240ab8887c893172f7ea04 (patch) | |
| tree | a8965eba08e3c2c1709ade8b313ad7b691ec22a5 | |
| parent | f988edb4e1b86ece3a376e774a1d52da72714fb0 (diff) | |
| download | postgresql-6f0ebe3fba35341e9e240ab8887c893172f7ea04.tar.gz postgresql-6f0ebe3fba35341e9e240ab8887c893172f7ea04.zip | |
Deal with cases where getpeereid _and_ another creditial method is
supported.
| -rw-r--r-- | src/backend/libpq/auth.c | 6 | ||||
| -rw-r--r-- | src/interfaces/libpq/fe-auth.c | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c index d036a22f6e5..0e0b64555bc 100644 --- a/src/backend/libpq/auth.c +++ b/src/backend/libpq/auth.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.91 2002/09/04 23:31:34 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.92 2002/12/03 22:09:19 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -430,7 +430,9 @@ ClientAuthentication(Port *port) break; case uaIdent: -#if !defined(SO_PEERCRED) && (defined(HAVE_STRUCT_CMSGCRED) || defined(HAVE_STRUCT_FCRED) || (defined(HAVE_STRUCT_SOCKCRED) && defined(LOCAL_CREDS))) +#if defined(HAVE_STRUCT_CMSGCRED) || defined(HAVE_STRUCT_FCRED) || \ + (defined(HAVE_STRUCT_SOCKCRED) && defined(LOCAL_CREDS)) && \ + !defined(HAVE_GETPEEREID) && !defined(SO_PEERCRED) /* * If we are doing ident on unix-domain sockets, use SCM_CREDS diff --git a/src/interfaces/libpq/fe-auth.c b/src/interfaces/libpq/fe-auth.c index 5a6e492b644..eae0fa5f48f 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.71 2002/09/04 20:31:46 momjian Exp $ + * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-auth.c,v 1.72 2002/12/03 22:09:20 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -449,7 +449,9 @@ pg_krb5_sendauth(char *PQerrormsg, int sock, static int pg_local_sendauth(char *PQerrormsg, PGconn *conn) { -#if defined(HAVE_STRUCT_CMSGCRED) || defined(HAVE_STRUCT_FCRED) || (defined(HAVE_STRUCT_SOCKCRED) && defined(LOCAL_CREDS)) +#if defined(HAVE_STRUCT_CMSGCRED) || defined(HAVE_STRUCT_FCRED) || \ + (defined(HAVE_STRUCT_SOCKCRED) && defined(LOCAL_CREDS)) && \ + !defined(HAVE_GETPEEREID) && !defined(SO_PEERCRED) char buf; struct iovec iov; struct msghdr msg; |