Remove inappropriate inclusions of OpenSSL internal header e_os.h,

as well as unnecessary (and incorrect on Windows) assignments to
errno/SOCK_ERRNO.

diff --git a/src/backend/libpq/be-secure.c b/src/backend/libpq/be-secure.c
index 7288a2bec5c804b3eda4b7fa4d063e14e8fbe485..7973f2a05b02abe0155d1ba8303e75901a269659 100644 (file)
--- 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 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)
  *       will normally be stored unencrypted so that the database
@@ -105,7 +105,6 @@
 
 #ifdef USE_SSL
 #include <openssl/ssl.h>
-#include <openssl/e_os.h>
 #include <openssl/dh.h>
 #endif
 
@@ -289,7 +288,6 @@ secure_read(Port *port, void *ptr, size_t len)
                        case SSL_ERROR_WANT_READ:
                                break;
                        case SSL_ERROR_SYSCALL:
-                               errno = get_last_socket_error();
                                elog(ERROR, "SSL SYSCALL error: %s", strerror(errno));
                                break;
                        case SSL_ERROR_SSL:
@@ -339,7 +337,6 @@ secure_write(Port *port, const void *ptr, size_t len)
                        case SSL_ERROR_WANT_WRITE:
                                break;
                        case SSL_ERROR_SYSCALL:
-                               errno = get_last_socket_error();
                                elog(ERROR, "SSL SYSCALL error: %s", strerror(errno));
                                break;
                        case SSL_ERROR_SSL:

diff --git a/src/interfaces/libpq/fe-secure.c b/src/interfaces/libpq/fe-secure.c
index 07a9f3af14507185c07fbff4f8f6494796b2722d..c32697f0aab78a4e005aa09e44ca76548d8aa193 100644 (file)
--- 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));