aboutsummaryrefslogtreecommitdiff
path: root/src/interfaces/libpq/fe-auth.c
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2002-12-03 22:09:20 +0000
committerBruce Momjian <bruce@momjian.us>2002-12-03 22:09:20 +0000
commit6f0ebe3fba35341e9e240ab8887c893172f7ea04 (patch)
treea8965eba08e3c2c1709ade8b313ad7b691ec22a5 /src/interfaces/libpq/fe-auth.c
parentf988edb4e1b86ece3a376e774a1d52da72714fb0 (diff)
downloadpostgresql-6f0ebe3fba35341e9e240ab8887c893172f7ea04.tar.gz
postgresql-6f0ebe3fba35341e9e240ab8887c893172f7ea04.zip
Deal with cases where getpeereid _and_ another creditial method is
supported.
Diffstat (limited to 'src/interfaces/libpq/fe-auth.c')
-rw-r--r--src/interfaces/libpq/fe-auth.c6
1 files changed, 4 insertions, 2 deletions
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;