Commit b86a71c8 authored by Bruce Momjian's avatar Bruce Momjian

Clarify variable naming: pq_initssllib -> pq_init_ssl_lib

parent 03877708
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/interfaces/libpq/fe-secure.c,v 1.120 2009/03/28 01:36:11 momjian Exp $ * $PostgreSQL: pgsql/src/interfaces/libpq/fe-secure.c,v 1.121 2009/03/28 18:48:55 momjian Exp $
* *
* NOTES * NOTES
* *
...@@ -98,7 +98,7 @@ static void close_SSL(PGconn *); ...@@ -98,7 +98,7 @@ static void close_SSL(PGconn *);
static char *SSLerrmessage(void); static char *SSLerrmessage(void);
static void SSLerrfree(char *buf); static void SSLerrfree(char *buf);
static bool pq_initssllib = true; static bool pq_init_ssl_lib = true;
static SSL_CTX *SSL_context = NULL; static SSL_CTX *SSL_context = NULL;
#ifdef ENABLE_THREAD_SAFETY #ifdef ENABLE_THREAD_SAFETY
...@@ -173,7 +173,7 @@ void ...@@ -173,7 +173,7 @@ void
PQinitSSL(int do_init) PQinitSSL(int do_init)
{ {
#ifdef USE_SSL #ifdef USE_SSL
pq_initssllib = do_init; pq_init_ssl_lib = do_init;
#endif #endif
} }
...@@ -840,7 +840,7 @@ init_ssl_system(PGconn *conn) ...@@ -840,7 +840,7 @@ init_ssl_system(PGconn *conn)
if (pthread_mutex_lock(&ssl_config_mutex)) if (pthread_mutex_lock(&ssl_config_mutex))
return -1; return -1;
if (pq_initssllib) if (pq_init_ssl_lib)
{ {
/* /*
* If necessary, set up an array to hold locks for OpenSSL. OpenSSL will * If necessary, set up an array to hold locks for OpenSSL. OpenSSL will
...@@ -880,7 +880,7 @@ init_ssl_system(PGconn *conn) ...@@ -880,7 +880,7 @@ init_ssl_system(PGconn *conn)
if (!SSL_context) if (!SSL_context)
{ {
if (pq_initssllib) if (pq_init_ssl_lib)
{ {
#if SSLEAY_VERSION_NUMBER >= 0x00907000L #if SSLEAY_VERSION_NUMBER >= 0x00907000L
OPENSSL_config(NULL); OPENSSL_config(NULL);
...@@ -928,7 +928,7 @@ destroy_ssl_system(void) ...@@ -928,7 +928,7 @@ destroy_ssl_system(void)
if (pthread_mutex_lock(&ssl_config_mutex)) if (pthread_mutex_lock(&ssl_config_mutex))
return; return;
if (pq_initssllib) if (pq_init_ssl_lib)
{ {
if (ssl_open_connections > 0) if (ssl_open_connections > 0)
--ssl_open_connections; --ssl_open_connections;
......
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