rdelaage/postgresql
1
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-10-07 05:26:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

libpq: Report strerror on pthread_mutex_lock() failure

Browse Source
This commit is contained in:
Peter Eisentraut 2013-08-17 21:46:32 -04:00
parent 8820b50236
commit 7c8de5d3e5
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/interfaces/libpq/fe-secure.c
View File

@ -256,14 +256,18 @@ pqsecure_open_client(PGconn *conn)
/* First time through? */ /* First time through? */
if (conn->ssl == NULL) if (conn->ssl == NULL)
{ {
#ifdef ENABLE_THREAD_SAFETY
int rc;
#endif
/* We cannot use MSG_NOSIGNAL to block SIGPIPE when using SSL */ /* We cannot use MSG_NOSIGNAL to block SIGPIPE when using SSL */
conn->sigpipe_flag = false; conn->sigpipe_flag = false;
#ifdef ENABLE_THREAD_SAFETY #ifdef ENABLE_THREAD_SAFETY
if (pthread_mutex_lock(&ssl_config_mutex)) if ((rc = pthread_mutex_lock(&ssl_config_mutex)))
{ {
printfPQExpBuffer(&conn->errorMessage, printfPQExpBuffer(&conn->errorMessage,
libpq_gettext("unable to acquire mutex\n")); libpq_gettext("could not acquire mutex: %s\n"), strerror(rc));
return PGRES_POLLING_FAILED; return PGRES_POLLING_FAILED;
} }
#endif #endif
@ -1115,10 +1119,12 @@ initialize_SSL(PGconn *conn)
* SSL_context struct. * SSL_context struct.
*/ */
#ifdef ENABLE_THREAD_SAFETY #ifdef ENABLE_THREAD_SAFETY
if (pthread_mutex_lock(&ssl_config_mutex)) int rc;
if ((rc = pthread_mutex_lock(&ssl_config_mutex)))
{ {
printfPQExpBuffer(&conn->errorMessage, printfPQExpBuffer(&conn->errorMessage,
libpq_gettext("unable to acquire mutex\n")); libpq_gettext("could not acquire mutex: %s\n"), strerror(rc));
return -1; return -1;
} }
#endif #endif
@ -1333,10 +1339,12 @@ initialize_SSL(PGconn *conn)
X509_STORE *cvstore; X509_STORE *cvstore;
#ifdef ENABLE_THREAD_SAFETY #ifdef ENABLE_THREAD_SAFETY
if (pthread_mutex_lock(&ssl_config_mutex)) int rc;
if ((rc = pthread_mutex_lock(&ssl_config_mutex)))
{ {
printfPQExpBuffer(&conn->errorMessage, printfPQExpBuffer(&conn->errorMessage,
libpq_gettext("unable to acquire mutex\n")); libpq_gettext("could not acquire mutex: %s\n"), strerror(rc));
return -1; return -1;
} }
#endif #endif