Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit e78b930

Browse files
committed
Fix bugs in OpenSSL hook renaming.
libpq's exports.txt was overlooked in commit 36d1087, 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.
1 parent 36d1087 commit e78b930

File tree

4 files changed

+12
-11
lines changed

4 files changed

+12
-11
lines changed

doc/src/sgml/libpq.sgml

+7-6
Original file line numberDiff line numberDiff line change
@@ -776,7 +776,7 @@ PGPing PQping(const char *conninfo);
776776
</listitem>
777777
</varlistentry>
778778

779-
<varlistentry id="libpq-pqsetsslkeypasshook">
779+
<varlistentry id="libpq-pqsetsslkeypasshook-openssl">
780780
<term><function>PQsetSSLKeyPassHook_OpenSSL</function><indexterm><primary>PQsetSSLKeyPassHook_OpenSSL</primary></indexterm></term>
781781
<listitem>
782782
<para>
@@ -826,16 +826,16 @@ int callback_fn(char *buf, int size, PGconn *conn);
826826
</listitem>
827827
</varlistentry>
828828

829-
<varlistentry id="libpq-pqgetsslkeypasshook">
830-
<term><function>PQgetSSLKeyPassHook</function><indexterm><primary>PQgetSSLKeyPassHook</primary></indexterm></term>
829+
<varlistentry id="libpq-pqgetsslkeypasshook-openssl">
830+
<term><function>PQgetSSLKeyPassHook_OpenSSL</function><indexterm><primary>PQgetSSLKeyPassHook_OpenSSL</primary></indexterm></term>
831831
<listitem>
832832
<para>
833-
<function>PQgetSSLKeyPassHook</function> returns the current
833+
<function>PQgetSSLKeyPassHook_OpenSSL</function> returns the current
834834
client certificate key password hook, or <literal>NULL</literal>
835835
if none has been set.
836836

837837
<synopsis>
838-
PQsslKeyPassHook_OpenSSL_type PQgetSSLKeyPassHook(void);
838+
PQsslKeyPassHook_OpenSSL_type PQgetSSLKeyPassHook_OpenSSL(void);
839839
</synopsis>
840840
</para>
841841

@@ -7670,7 +7670,8 @@ ldap://ldap.acme.com/cn=dbserver,cn=hosts?pgconnectinfo?base?(objectclass=*)
76707670
OpenSSL with a <literal>Enter PEM pass phrase:</literal>
76717671
prompt if a TTY is available. Applications can override the client certificate
76727672
prompt and the handling of the <literal>sslpassword</literal> parameter by supplying
7673-
their own key password callback; see <xref linkend="libpq-pqsetsslkeypasshook"/>.
7673+
their own key password callback; see
7674+
<xref linkend="libpq-pqsetsslkeypasshook-openssl"/>.
76747675
</para>
76757676

76767677
<para>

src/interfaces/libpq/exports.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,6 @@ PQresultMemorySize 173
176176
PQhostaddr 174
177177
PQgssEncInUse 175
178178
PQgetgssctx 176
179-
PQsetSSLKeyPassHook 177
180-
PQgetSSLKeyPassHook 178
181-
PQdefaultSSLKeyPassHook 179
179+
PQsetSSLKeyPassHook_OpenSSL 177
180+
PQgetSSLKeyPassHook_OpenSSL 178
181+
PQdefaultSSLKeyPassHook_OpenSSL 179

src/interfaces/libpq/fe-secure-openssl.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1687,7 +1687,7 @@ PQdefaultSSLKeyPassHook_OpenSSL(char *buf, int size, PGconn *conn)
16871687
}
16881688

16891689
PQsslKeyPassHook_OpenSSL_type
1690-
PQgetSSLKeyPassHook(void)
1690+
PQgetSSLKeyPassHook_OpenSSL(void)
16911691
{
16921692
return PQsslKeyPassHook;
16931693
}

src/interfaces/libpq/libpq-fe.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -621,7 +621,7 @@ extern int pg_valid_server_encoding_id(int encoding);
621621

622622
/* Support for overriding sslpassword handling with a callback. */
623623
typedef int (*PQsslKeyPassHook_OpenSSL_type) (char *buf, int size, PGconn *conn);
624-
extern PQsslKeyPassHook_OpenSSL_type PQgetSSLKeyPassHook(void);
624+
extern PQsslKeyPassHook_OpenSSL_type PQgetSSLKeyPassHook_OpenSSL(void);
625625
extern void PQsetSSLKeyPassHook_OpenSSL(PQsslKeyPassHook_OpenSSL_type hook);
626626
extern int PQdefaultSSLKeyPassHook_OpenSSL(char *buf, int size, PGconn *conn);
627627

0 commit comments

Comments
 (0)