diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2003-12-20 18:46:02 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2003-12-20 18:46:02 +0000 |
| commit | 1661b86bca70b6ba8dc189c48baf46ffb549ab5c (patch) | |
| tree | d144b99f19fe585cf88c8dd4847b995023e331bc /src | |
| parent | 7133152c5b604ed7b1e4e3f80df7109401bed8d5 (diff) | |
| download | postgresql-1661b86bca70b6ba8dc189c48baf46ffb549ab5c.tar.gz postgresql-1661b86bca70b6ba8dc189c48baf46ffb549ab5c.zip | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/interfaces/libpq/fe-auth.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/interfaces/libpq/fe-auth.c b/src/interfaces/libpq/fe-auth.c index 80a89782ddd..a6a769697a7 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.84.2.2 2003/12/20 18:25:02 tgl Exp $ + * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-auth.c,v 1.84.2.3 2003/12/20 18:46:02 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -450,16 +450,15 @@ pg_krb5_sendauth(char *PQerrormsg, int sock, const char *hostname) /* * Respond to AUTH_REQ_SCM_CREDS challenge. * - * Note: the backend will not use this challenge if HAVE_GETPEEREID - * or SO_PEERCRED is defined, so we don't bother to compile any code - * in that case, even if the facility is available. + * Note: current backends will not use this challenge if HAVE_GETPEEREID + * or SO_PEERCRED is defined, but pre-7.4 backends might, so compile the + * code anyway. */ static int pg_local_sendauth(char *PQerrormsg, PGconn *conn) { -#if !defined(HAVE_GETPEEREID) && !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)) char buf; struct iovec iov; struct msghdr msg; |