diff options
| -rw-r--r-- | doc/src/sgml/libpq.sgml | 13 | ||||
| -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 |
4 files changed, 12 insertions, 11 deletions
diff --git a/doc/src/sgml/libpq.sgml b/doc/src/sgml/libpq.sgml index ca9aa623a24..52631f458ff 100644 --- a/doc/src/sgml/libpq.sgml +++ b/doc/src/sgml/libpq.sgml @@ -776,7 +776,7 @@ PGPing PQping(const char *conninfo); </listitem> </varlistentry> - <varlistentry id="libpq-pqsetsslkeypasshook"> + <varlistentry id="libpq-pqsetsslkeypasshook-openssl"> <term><function>PQsetSSLKeyPassHook_OpenSSL</function><indexterm><primary>PQsetSSLKeyPassHook_OpenSSL</primary></indexterm></term> <listitem> <para> @@ -826,16 +826,16 @@ int callback_fn(char *buf, int size, PGconn *conn); </listitem> </varlistentry> - <varlistentry id="libpq-pqgetsslkeypasshook"> - <term><function>PQgetSSLKeyPassHook</function><indexterm><primary>PQgetSSLKeyPassHook</primary></indexterm></term> + <varlistentry id="libpq-pqgetsslkeypasshook-openssl"> + <term><function>PQgetSSLKeyPassHook_OpenSSL</function><indexterm><primary>PQgetSSLKeyPassHook_OpenSSL</primary></indexterm></term> <listitem> <para> - <function>PQgetSSLKeyPassHook</function> returns the current + <function>PQgetSSLKeyPassHook_OpenSSL</function> returns the current client certificate key password hook, or <literal>NULL</literal> if none has been set. <synopsis> -PQsslKeyPassHook_OpenSSL_type PQgetSSLKeyPassHook(void); +PQsslKeyPassHook_OpenSSL_type PQgetSSLKeyPassHook_OpenSSL(void); </synopsis> </para> @@ -7670,7 +7670,8 @@ ldap://ldap.acme.com/cn=dbserver,cn=hosts?pgconnectinfo?base?(objectclass=*) OpenSSL with a <literal>Enter PEM pass phrase:</literal> prompt if a TTY is available. Applications can override the client certificate prompt and the handling of the <literal>sslpassword</literal> parameter by supplying - their own key password callback; see <xref linkend="libpq-pqsetsslkeypasshook"/>. + their own key password callback; see + <xref linkend="libpq-pqsetsslkeypasshook-openssl"/>. </para> <para> 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); |