diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2002-11-07 18:45:51 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2002-11-07 18:45:51 +0000 |
| commit | 3a4b3ac3a55b09a45d769c1d6872286cfdd5236e (patch) | |
| tree | c293eff92a81d127f0b6409a91be9f94493bdd74 /src/interfaces | |
| parent | 11c4f2d97d94c2637c4a1305c1da1c26df891a8c (diff) | |
| download | postgresql-3a4b3ac3a55b09a45d769c1d6872286cfdd5236e.tar.gz | |
Remove inappropriate inclusions of OpenSSL internal header e_os.h,
as well as unnecessary (and incorrect on Windows) assignments to
errno/SOCK_ERRNO.
Diffstat (limited to 'src/interfaces')
| -rw-r--r-- | src/interfaces/libpq/fe-secure.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/interfaces/libpq/fe-secure.c b/src/interfaces/libpq/fe-secure.c index 07a9f3af14..c32697f0aa 100644 --- a/src/interfaces/libpq/fe-secure.c +++ b/src/interfaces/libpq/fe-secure.c @@ -11,7 +11,7 @@ * * * 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 * The client *requires* a valid server certificate. Since @@ -117,7 +117,7 @@ #ifdef USE_SSL #include <openssl/ssl.h> -#include <openssl/e_os.h> +#include <openssl/dh.h> #endif /* USE_SSL */ @@ -270,7 +270,6 @@ pqsecure_read(PGconn *conn, void *ptr, size_t len) case SSL_ERROR_WANT_READ: break; case SSL_ERROR_SYSCALL: - SOCK_ERRNO = get_last_socket_error(); printfPQExpBuffer(&conn->errorMessage, libpq_gettext("SSL SYSCALL error: %s\n"), SOCK_STRERROR(SOCK_ERRNO)); @@ -316,7 +315,6 @@ pqsecure_write(PGconn *conn, const void *ptr, size_t len) case SSL_ERROR_WANT_WRITE: break; case SSL_ERROR_SYSCALL: - SOCK_ERRNO = get_last_socket_error(); printfPQExpBuffer(&conn->errorMessage, libpq_gettext("SSL SYSCALL error: %s\n"), SOCK_STRERROR(SOCK_ERRNO)); |