aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2002-12-13 22:20:22 +0000
committerBruce Momjian <bruce@momjian.us>2002-12-13 22:20:22 +0000
commit77a9708f85128de2859ccf328baa422a16d9501c (patch)
tree1819600e3ae229ad10a55bac5f365d0b076818fc /src
parent9056af5b631415b63a498d755f0602cedcf68216 (diff)
downloadpostgresql-77a9708f85128de2859ccf328baa422a16d9501c.tar.gz
postgresql-77a9708f85128de2859ccf328baa422a16d9501c.zip
Backpatch SSL fixes into 7.3.1.
Diffstat (limited to 'src')
-rw-r--r--src/backend/libpq/be-secure.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/backend/libpq/be-secure.c b/src/backend/libpq/be-secure.c
index 98ce0aa5339..c603f0219b0 100644
--- a/src/backend/libpq/be-secure.c
+++ b/src/backend/libpq/be-secure.c
@@ -11,7 +11,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/libpq/be-secure.c,v 1.15.2.1 2002/11/07 18:47:08 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/libpq/be-secure.c,v 1.15.2.2 2002/12/13 22:20:22 momjian Exp $
*
* Since the server static private key ($DataDir/server.key)
* will normally be stored unencrypted so that the database
@@ -288,7 +288,8 @@ secure_read(Port *port, void *ptr, size_t len)
case SSL_ERROR_WANT_READ:
break;
case SSL_ERROR_SYSCALL:
- elog(ERROR, "SSL SYSCALL error: %s", strerror(errno));
+ if (n == -1)
+ elog(ERROR, "SSL SYSCALL error: %s", strerror(errno));
break;
case SSL_ERROR_SSL:
elog(ERROR, "SSL error: %s", SSLerrmessage());
@@ -337,7 +338,8 @@ secure_write(Port *port, const void *ptr, size_t len)
case SSL_ERROR_WANT_WRITE:
break;
case SSL_ERROR_SYSCALL:
- elog(ERROR, "SSL SYSCALL error: %s", strerror(errno));
+ if (n == -1)
+ elog(ERROR, "SSL SYSCALL error: %s", strerror(errno));
break;
case SSL_ERROR_SSL:
elog(ERROR, "SSL error: %s", SSLerrmessage());