rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Bruce Momjian 2002-12-14 18:39:14 +00:00
parent 1b42ad7e59
commit fb2d7a24f9
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/backend/libpq/be-secure.c
View File

@ -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;
}