NotificationsYou must be signed in to change notification settings
Fork28
Star153

Commit13c98bd

committed

Fix assorted portability issues in commit896fcdb.

Some platforms require libssl to be linked explicitly in the newSSL test module. Borrow contrib/sslinfo's code for that.Since src/test/modules/Makefile now has a variable SUBDIRS list,it needs to follow the ALWAYS_SUBDIRS protocol for that (cf.comments in Makefile.global.in).Blindly try to fix MSVC build failures by adding PGDLLIMPORT.

1 parent896fcdb commit13c98bdCopy full SHA for 13c98bd

File tree

4 files changed

-4

lines changed

src
- include/libpq
  - libpq-be.h
  - libpq.h
- test/modules
  - Makefile
  - ssl_passphrase_callback
    - Makefile

4 files changed

-4

lines changed

`‎src/include/libpq/libpq-be.h‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -289,7 +289,7 @@ extern char be_tls_get_certificate_hash(Port port, size_t *len);`
`289`	`289`
`290`	`290`	`/* init hook for SSL, the default sets the password callback if appropriate */`
`291`	`291`	`typedefvoid(openssl_tls_init_hook_typ)(SSL_CTXcontext,boolisServerStart);`
`292`		`-externopenssl_tls_init_hook_typopenssl_tls_init_hook;`
	`292`	`+externPGDLLIMPORTopenssl_tls_init_hook_typopenssl_tls_init_hook;`
`293`	`293`
`294`	`294`	`#endif/* USE_SSL */`
`295`	`295`

`‎src/include/libpq/libpq.h‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -83,8 +83,8 @@ extern char *ssl_key_file;`
`83`	`83`	`externchar*ssl_ca_file;`
`84`	`84`	`externchar*ssl_crl_file;`
`85`	`85`	`externchar*ssl_dh_params_file;`
`86`		`-externchar*ssl_passphrase_command;`
`87`		`-externboolssl_passphrase_command_supports_reload;`
	`86`	`+externPGDLLIMPORTchar*ssl_passphrase_command;`
	`87`	`+externPGDLLIMPORTboolssl_passphrase_command_supports_reload;`
`88`	`88`	`#ifdefUSE_SSL`
`89`	`89`	`externboolssl_loaded_verify_locations;`
`90`	`90`	`#endif`

`‎src/test/modules/Makefile‎`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,9 @@ SUBDIRS = \`
`27`	`27`
`28`	`28`	`ifeq ($(with_openssl),yes)`
`29`	`29`	`SUBDIRS += ssl_passphrase_callback`
	`30`	`+else`
	`31`	`+ALWAYS_SUBDIRS += ssl_passphrase_callback`
`30`	`32`	`endif`
`31`	`33`
`32`		`-`
`33`	`34`	`$(recurse)`
	`35`	`+$(recurse_always)`

`‎src/test/modules/ssl_passphrase_callback/Makefile‎`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,8 @@ include $(top_builddir)/src/Makefile.global`
`17`	`17`	`include$(top_srcdir)/contrib/contrib-global.mk`
`18`	`18`	`endif`
`19`	`19`
	`20`	`+SHLIB_LINK +=$(filter -lssl -lcrypto -lssleay32 -leay32,$(LIBS))`
	`21`	`+`
`20`	`22`	`check: prove-check`
`21`	`23`
`22`	`24`	`prove-check: ssl_passphrase_func$(DLSUFFIX) \| temp-install`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit13c98bd

File tree

4 files changed

4 files changed

`‎src/include/libpq/libpq-be.h‎`

`‎src/include/libpq/libpq.h‎`

`‎src/test/modules/Makefile‎`

`‎src/test/modules/ssl_passphrase_callback/Makefile‎`

0 commit comments