From fb2d7a24f9769f5a22747ac821b67eb5f9dd61be Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Sat, 14 Dec 2002 18:39:14 +0000 Subject: [PATCH] Ok, I think I've gotten this figured out now. I saw this comment in pqcomm.c, switched the ERROR logs to COMMERROR logs and it all works. I've attached a patch to be-secure.c that fixes all my problems. Nathan Mueller --- src/backend/libpq/be-secure.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/backend/libpq/be-secure.c b/src/backend/libpq/be-secure.c index e727b89489..ccb434cdd0 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.18 2002/12/13 05:51:29 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/libpq/be-secure.c,v 1.19 2002/12/14 18:39:14 momjian Exp $ * * Since the server static private key ($DataDir/server.key) * will normally be stored unencrypted so that the database @@ -289,10 +289,10 @@ secure_read(Port *port, void *ptr, size_t len) break; case SSL_ERROR_SYSCALL: if (n == -1) - elog(ERROR, "SSL SYSCALL error: %s", strerror(errno)); + elog(COMMERROR, "SSL SYSCALL error: %s", strerror(errno)); break; case SSL_ERROR_SSL: - elog(ERROR, "SSL error: %s", SSLerrmessage()); + elog(COMMERROR, "SSL error: %s", SSLerrmessage()); /* fall through */ case SSL_ERROR_ZERO_RETURN: secure_close(port); @@ -339,10 +339,10 @@ secure_write(Port *port, const void *ptr, size_t len) break; case SSL_ERROR_SYSCALL: if (n == -1) - elog(ERROR, "SSL SYSCALL error: %s", strerror(errno)); + elog(COMMERROR, "SSL SYSCALL error: %s", strerror(errno)); break; case SSL_ERROR_SSL: - elog(ERROR, "SSL error: %s", SSLerrmessage()); + elog(COMMERROR, "SSL error: %s", SSLerrmessage()); /* fall through */ case SSL_ERROR_ZERO_RETURN: secure_close(port); @@ -678,7 +678,7 @@ open_server_SSL(Port *port) !SSL_set_fd(port->ssl, port->sock) || SSL_accept(port->ssl) <= 0) { - elog(ERROR, "failed to initialize SSL connection: %s", SSLerrmessage()); + elog(COMMERROR, "failed to initialize SSL connection: %s", SSLerrmessage()); close_SSL(port); return -1; }