database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-28 23:42:10 +03:00
Code Activity

Don't bother to request SSL connection over a Unix socket, since the

Browse Source 
postmaster won't accept the request anyway.  (If your kernel can't
be trusted, SSL will not help you.)
This commit is contained in:
Tom Lane
2002-03-02 00:49:22 +00:00
parent 608d843e61
commit 78ab803402
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/interfaces/libpq/fe-connect.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.181 2001/11/11 02:09:05 tgl Exp $ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.182 2002/03/02 00:49:22 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -309,7 +309,8 @@ PQconnectStart(const char *conninfo)
conn->pgpass = tmp ? strdup(tmp) : NULL; conn->pgpass = tmp ? strdup(tmp) : NULL;
#ifdef USE_SSL #ifdef USE_SSL
tmp = conninfo_getval(connOptions, "requiressl"); tmp = conninfo_getval(connOptions, "requiressl");
conn->require_ssl = tmp ? (tmp[0] == '1' ? true : false) : false; if (tmp && tmp[0] == '1')
conn->require_ssl = true;
#endif #endif
/* /*
@ -504,8 +505,6 @@ PQsetdbLogin(const char *pghost, const char *pgport, const char *pgoptions,
#ifdef USE_SSL #ifdef USE_SSL
if ((tmp = getenv("PGREQUIRESSL")) != NULL) if ((tmp = getenv("PGREQUIRESSL")) != NULL)
conn->require_ssl = (tmp[0] == '1') ? true : false; conn->require_ssl = (tmp[0] == '1') ? true : false;
else
conn->require_ssl = 0;
#endif #endif
if (error) if (error)
@ -871,6 +870,11 @@ connectDBStart(PGconn *conn)
{ {
UNIXSOCK_PATH(conn->raddr.un, portno, conn->pgunixsocket); UNIXSOCK_PATH(conn->raddr.un, portno, conn->pgunixsocket);
conn->raddr_len = UNIXSOCK_LEN(conn->raddr.un); conn->raddr_len = UNIXSOCK_LEN(conn->raddr.un);
#ifdef USE_SSL
/* Don't bother requesting SSL over a Unix socket */
conn->allow_ssl_try = false;
conn->require_ssl = false;
#endif
} }
#endif #endif