Commit fb8ac3fc authored by Tom Lane's avatar Tom Lane

Dept. of third thoughts: in fact, libpq should support SCM_CREDS challenge

even when HAVE_GETPEEREID is defined, else it will be unable to connect to
pre-7.4 backends that are using IDENT authentication.
parent b8f29802
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
* exceed INITIAL_EXPBUFFER_SIZE (currently 256 bytes). * exceed INITIAL_EXPBUFFER_SIZE (currently 256 bytes).
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/interfaces/libpq/fe-auth.c,v 1.87 2003/12/20 18:24:52 tgl Exp $ * $PostgreSQL: pgsql/src/interfaces/libpq/fe-auth.c,v 1.88 2003/12/20 18:45:49 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -450,16 +450,15 @@ pg_krb5_sendauth(char *PQerrormsg, int sock, const char *hostname) ...@@ -450,16 +450,15 @@ pg_krb5_sendauth(char *PQerrormsg, int sock, const char *hostname)
/* /*
* Respond to AUTH_REQ_SCM_CREDS challenge. * Respond to AUTH_REQ_SCM_CREDS challenge.
* *
* Note: the backend will not use this challenge if HAVE_GETPEEREID * Note: current backends will not use this challenge if HAVE_GETPEEREID
* or SO_PEERCRED is defined, so we don't bother to compile any code * or SO_PEERCRED is defined, but pre-7.4 backends might, so compile the
* in that case, even if the facility is available. * code anyway.
*/ */
static int static int
pg_local_sendauth(char *PQerrormsg, PGconn *conn) pg_local_sendauth(char *PQerrormsg, PGconn *conn)
{ {
#if !defined(HAVE_GETPEEREID) && !defined(SO_PEERCRED) && \ #if defined(HAVE_STRUCT_CMSGCRED) || defined(HAVE_STRUCT_FCRED) || \
(defined(HAVE_STRUCT_CMSGCRED) || defined(HAVE_STRUCT_FCRED) || \ (defined(HAVE_STRUCT_SOCKCRED) && defined(LOCAL_CREDS))
(defined(HAVE_STRUCT_SOCKCRED) && defined(LOCAL_CREDS)))
char buf; char buf;
struct iovec iov; struct iovec iov;
struct msghdr msg; struct msghdr msg;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment