diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2020-05-16 19:44:49 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2020-05-16 19:44:49 -0400 |
| commit | e78b93094518b1e262cba8115470f252dde6f446 (patch) | |
| tree | f78439a644c7e41bbcf92ffc195d28e5b38a10aa /src | |
| parent | 36d1087611bf96b0cd716666fc8c4a2d168fa501 (diff) | |
| download | postgresql-e78b93094518b1e262cba8115470f252dde6f446.tar.gz postgresql-e78b93094518b1e262cba8115470f252dde6f446.zip | |
Fix bugs in OpenSSL hook renaming.
libpq's exports.txt was overlooked in commit 36d108761, which the
buildfarm is quite unhappy about.
Also, I'd gathered that the plan included renaming PQgetSSLKeyPassHook
to PQgetSSLKeyPassHook_OpenSSL, but that didn't happen in the patch
as committed. I'm taking it on my own authority to do so now, since
the window before beta1 is closing fast.
Diffstat (limited to 'src')
| -rw-r--r-- | src/interfaces/libpq/exports.txt | 6 | ||||
| -rw-r--r-- | src/interfaces/libpq/fe-secure-openssl.c | 2 | ||||
| -rw-r--r-- | src/interfaces/libpq/libpq-fe.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/interfaces/libpq/exports.txt b/src/interfaces/libpq/exports.txt index 5fc1e5d2894..bbc1f904816 100644 --- a/src/interfaces/libpq/exports.txt +++ b/src/interfaces/libpq/exports.txt @@ -176,6 +176,6 @@ PQresultMemorySize 173 PQhostaddr 174 PQgssEncInUse 175 PQgetgssctx 176 -PQsetSSLKeyPassHook 177 -PQgetSSLKeyPassHook 178 -PQdefaultSSLKeyPassHook 179 +PQsetSSLKeyPassHook_OpenSSL 177 +PQgetSSLKeyPassHook_OpenSSL 178 +PQdefaultSSLKeyPassHook_OpenSSL 179 diff --git a/src/interfaces/libpq/fe-secure-openssl.c b/src/interfaces/libpq/fe-secure-openssl.c index 7d45fbf86b9..68823a04d65 100644 --- a/src/interfaces/libpq/fe-secure-openssl.c +++ b/src/interfaces/libpq/fe-secure-openssl.c @@ -1687,7 +1687,7 @@ PQdefaultSSLKeyPassHook_OpenSSL(char *buf, int size, PGconn *conn) } PQsslKeyPassHook_OpenSSL_type -PQgetSSLKeyPassHook(void) +PQgetSSLKeyPassHook_OpenSSL(void) { return PQsslKeyPassHook; } diff --git a/src/interfaces/libpq/libpq-fe.h b/src/interfaces/libpq/libpq-fe.h index f104bbfa4a4..3b6a9fbce35 100644 --- a/src/interfaces/libpq/libpq-fe.h +++ b/src/interfaces/libpq/libpq-fe.h @@ -621,7 +621,7 @@ extern int pg_valid_server_encoding_id(int encoding); /* Support for overriding sslpassword handling with a callback. */ typedef int (*PQsslKeyPassHook_OpenSSL_type) (char *buf, int size, PGconn *conn); -extern PQsslKeyPassHook_OpenSSL_type PQgetSSLKeyPassHook(void); +extern PQsslKeyPassHook_OpenSSL_type PQgetSSLKeyPassHook_OpenSSL(void); extern void PQsetSSLKeyPassHook_OpenSSL(PQsslKeyPassHook_OpenSSL_type hook); extern int PQdefaultSSLKeyPassHook_OpenSSL(char *buf, int size, PGconn *conn); |