Commit3a4b3ac

committed

Remove inappropriate inclusions of OpenSSL internal header e_os.h,

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

1 parent11c4f2d commit3a4b3acCopy full SHA for 3a4b3ac

File tree

-8

lines changed

-8

lines changed

Lines changed: 1 addition & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`*`
`12`	`12`	`*`
`13`	`13`	`* IDENTIFICATION`
`14`		`- * $Header: /cvsroot/pgsql/src/backend/libpq/be-secure.c,v 1.15 2002/09/26 04:41:54 momjian Exp $`
	`14`	`+ * $Header: /cvsroot/pgsql/src/backend/libpq/be-secure.c,v 1.16 2002/11/07 18:45:51 tgl Exp $`
`15`	`15`	`*`
`16`	`16`	`* Since the server static private key ($DataDir/server.key)`
`17`	`17`	`* will normally be stored unencrypted so that the database`
`@@ -105,7 +105,6 @@`
`105`	`105`
`106`	`106`	`#ifdefUSE_SSL`
`107`	`107`	`#include<openssl/ssl.h>`
`108`		`-#include<openssl/e_os.h>`
`109`	`108`	`#include<openssl/dh.h>`
`110`	`109`	`#endif`
`111`	`110`
`@@ -289,7 +288,6 @@ secure_read(Port port, void ptr, size_t len)`
`289`	`288`	`caseSSL_ERROR_WANT_READ:`
`290`	`289`	`break;`
`291`	`290`	`caseSSL_ERROR_SYSCALL:`
`292`		`-errno=get_last_socket_error();`
`293`	`291`	`elog(ERROR,"SSL SYSCALL error: %s",strerror(errno));`
`294`	`292`	`break;`
`295`	`293`	`caseSSL_ERROR_SSL:`
`@@ -339,7 +337,6 @@ secure_write(Port port, const void ptr, size_t len)`
`339`	`337`	`caseSSL_ERROR_WANT_WRITE:`
`340`	`338`	`break;`
`341`	`339`	`caseSSL_ERROR_SYSCALL:`
`342`		`-errno=get_last_socket_error();`
`343`	`340`	`elog(ERROR,"SSL SYSCALL error: %s",strerror(errno));`
`344`	`341`	`break;`
`345`	`342`	`caseSSL_ERROR_SSL:`

Lines changed: 2 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`*`
`12`	`12`	`*`
`13`	`13`	`* IDENTIFICATION`
`14`		`- * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-secure.c,v 1.15 2002/09/26 05:37:58 momjian Exp $`
	`14`	`+ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-secure.c,v 1.16 2002/11/07 18:45:51 tgl Exp $`
`15`	`15`	`*`
`16`	`16`	`* NOTES`
`17`	`17`	`* The client requires a valid server certificate. Since`
`@@ -117,7 +117,7 @@`
`117`	`117`
`118`	`118`	`#ifdefUSE_SSL`
`119`	`119`	`#include<openssl/ssl.h>`
`120`		`-#include<openssl/e_os.h>`
	`120`	`+#include<openssl/dh.h>`
`121`	`121`	`#endif/* USE_SSL */`
`122`	`122`
`123`	`123`
`@@ -270,7 +270,6 @@ pqsecure_read(PGconn conn, void ptr, size_t len)`
`270`	`270`	`caseSSL_ERROR_WANT_READ:`
`271`	`271`	`break;`
`272`	`272`	`caseSSL_ERROR_SYSCALL:`
`273`		`-SOCK_ERRNO=get_last_socket_error();`
`274`	`273`	`printfPQExpBuffer(&conn->errorMessage,`
`275`	`274`	`libpq_gettext("SSL SYSCALL error: %s\n"),`
`276`	`275`	`SOCK_STRERROR(SOCK_ERRNO));`
`@@ -316,7 +315,6 @@ pqsecure_write(PGconn conn, const void ptr, size_t len)`
`316`	`315`	`caseSSL_ERROR_WANT_WRITE:`
`317`	`316`	`break;`
`318`	`317`	`caseSSL_ERROR_SYSCALL:`
`319`		`-SOCK_ERRNO=get_last_socket_error();`
`320`	`318`	`printfPQExpBuffer(&conn->errorMessage,`
`321`	`319`	`libpq_gettext("SSL SYSCALL error: %s\n"),`
`322`	`320`	`SOCK_STRERROR(SOCK_ERRNO));`

Comments

(0)