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 /doc/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 'doc/src')
| -rw-r--r-- | doc/src/sgml/libpq.sgml | 13 |
1 files changed, 7 insertions, 6 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> |