database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-29 13:56:47 +03:00
Code

Remove inappropriate inclusions of OpenSSL internal header e_os.h,

Browse Source 
as well as unnecessary (and incorrect on Windows) assignments to
errno/SOCK_ERRNO.
This commit is contained in:
Tom Lane 2002-11-07 18:45:51 +00:00
parent 11c4f2d97d
commit 3a4b3ac3a5
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,7 +11,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/libpq/be-secure.c,v 1.15 2002/09/26 04:41:54 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/libpq/be-secure.c,v 1.16 2002/11/07 18:45:51 tgl Exp $
* *
* Since the server static private key ($DataDir/server.key) * Since the server static private key ($DataDir/server.key)
* will normally be stored unencrypted so that the database * will normally be stored unencrypted so that the database
@ -105,7 +105,6 @@
#ifdef USE_SSL #ifdef USE_SSL
#include <openssl/ssl.h> #include <openssl/ssl.h>
#include <openssl/e_os.h>
#include <openssl/dh.h> #include <openssl/dh.h>
#endif #endif
@ -289,7 +288,6 @@ secure_read(Port *port, void *ptr, size_t len)
case SSL_ERROR_WANT_READ: case SSL_ERROR_WANT_READ:
break; break;
case SSL_ERROR_SYSCALL: case SSL_ERROR_SYSCALL:
errno = get_last_socket_error();
elog(ERROR, "SSL SYSCALL error: %s", strerror(errno)); elog(ERROR, "SSL SYSCALL error: %s", strerror(errno));
break; break;
case SSL_ERROR_SSL: case SSL_ERROR_SSL:
@ -339,7 +337,6 @@ secure_write(Port *port, const void *ptr, size_t len)
case SSL_ERROR_WANT_WRITE: case SSL_ERROR_WANT_WRITE:
break; break;
case SSL_ERROR_SYSCALL: case SSL_ERROR_SYSCALL:
errno = get_last_socket_error();
elog(ERROR, "SSL SYSCALL error: %s", strerror(errno)); elog(ERROR, "SSL SYSCALL error: %s", strerror(errno));
break; break;
case SSL_ERROR_SSL: case SSL_ERROR_SSL:

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

@ -11,7 +11,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-secure.c,v 1.15 2002/09/26 05:37:58 momjian Exp $ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-secure.c,v 1.16 2002/11/07 18:45:51 tgl Exp $
* *
* NOTES * NOTES
* The client *requires* a valid server certificate. Since * The client *requires* a valid server certificate. Since
@ -117,7 +117,7 @@
#ifdef USE_SSL #ifdef USE_SSL
#include <openssl/ssl.h> #include <openssl/ssl.h>
#include <openssl/e_os.h> #include <openssl/dh.h>
#endif /* USE_SSL */ #endif /* USE_SSL */
@ -270,7 +270,6 @@ pqsecure_read(PGconn *conn, void *ptr, size_t len)
case SSL_ERROR_WANT_READ: case SSL_ERROR_WANT_READ:
break; break;
case SSL_ERROR_SYSCALL: case SSL_ERROR_SYSCALL:
SOCK_ERRNO = get_last_socket_error();
printfPQExpBuffer(&conn->errorMessage, printfPQExpBuffer(&conn->errorMessage,
libpq_gettext("SSL SYSCALL error: %s\n"), libpq_gettext("SSL SYSCALL error: %s\n"),
SOCK_STRERROR(SOCK_ERRNO)); SOCK_STRERROR(SOCK_ERRNO));
@ -316,7 +315,6 @@ pqsecure_write(PGconn *conn, const void *ptr, size_t len)
case SSL_ERROR_WANT_WRITE: case SSL_ERROR_WANT_WRITE:
break; break;
case SSL_ERROR_SYSCALL: case SSL_ERROR_SYSCALL:
SOCK_ERRNO = get_last_socket_error();
printfPQExpBuffer(&conn->errorMessage, printfPQExpBuffer(&conn->errorMessage,
libpq_gettext("SSL SYSCALL error: %s\n"), libpq_gettext("SSL SYSCALL error: %s\n"),
SOCK_STRERROR(SOCK_ERRNO)); SOCK_STRERROR(SOCK_ERRNO));