|
11 | 11 | * |
12 | 12 | * |
13 | 13 | * IDENTIFICATION |
14 | | - * $PostgreSQL: pgsql/src/interfaces/libpq/fe-secure.c,v 1.120 2009/03/2801:36:11 momjian Exp $ |
| 14 | + * $PostgreSQL: pgsql/src/interfaces/libpq/fe-secure.c,v 1.121 2009/03/2818:48:55 momjian Exp $ |
15 | 15 | * |
16 | 16 | * NOTES |
17 | 17 | * |
@@ -98,7 +98,7 @@ static void close_SSL(PGconn *); |
98 | 98 | staticchar*SSLerrmessage(void); |
99 | 99 | staticvoidSSLerrfree(char*buf); |
100 | 100 |
|
101 | | -staticboolpq_initssllib= true; |
| 101 | +staticboolpq_init_ssl_lib= true; |
102 | 102 | staticSSL_CTX*SSL_context=NULL; |
103 | 103 |
|
104 | 104 | #ifdefENABLE_THREAD_SAFETY |
|
173 | 173 | PQinitSSL(intdo_init) |
174 | 174 | { |
175 | 175 | #ifdefUSE_SSL |
176 | | -pq_initssllib=do_init; |
| 176 | +pq_init_ssl_lib=do_init; |
177 | 177 | #endif |
178 | 178 | } |
179 | 179 |
|
@@ -840,7 +840,7 @@ init_ssl_system(PGconn *conn) |
840 | 840 | if (pthread_mutex_lock(&ssl_config_mutex)) |
841 | 841 | return-1; |
842 | 842 |
|
843 | | -if (pq_initssllib) |
| 843 | +if (pq_init_ssl_lib) |
844 | 844 | { |
845 | 845 | /* |
846 | 846 | * If necessary, set up an array to hold locks for OpenSSL. OpenSSL will |
@@ -880,7 +880,7 @@ init_ssl_system(PGconn *conn) |
880 | 880 |
|
881 | 881 | if (!SSL_context) |
882 | 882 | { |
883 | | -if (pq_initssllib) |
| 883 | +if (pq_init_ssl_lib) |
884 | 884 | { |
885 | 885 | #ifSSLEAY_VERSION_NUMBER >=0x00907000L |
886 | 886 | OPENSSL_config(NULL); |
@@ -928,7 +928,7 @@ destroy_ssl_system(void) |
928 | 928 | if (pthread_mutex_lock(&ssl_config_mutex)) |
929 | 929 | return; |
930 | 930 |
|
931 | | -if (pq_initssllib) |
| 931 | +if (pq_init_ssl_lib) |
932 | 932 | { |
933 | 933 | if (ssl_open_connections>0) |
934 | 934 | --ssl_open_connections; |
|