postgres.git / summary / log / commit / refs

commit    9e24109f1a4e4d8d1d372b004d6a0dd06e673fe7
Author:   Andrew Dunstan <andrew@dunslane.net>
Date:     Fri Apr 17 18:11:18 2020 +0000
First released in: master (reverted before release)
Reverted by: 6741cfa59647 (in 13.0)

    Only provide new libpq sslpasskey hook for openssl-enabled builds
    
    In commit 4dc6355210 I neglected to put #ifdef USE_OPENSSL around the
    declarations of the new items. This is remedied here.
    
    Per complaint from Daniel Gustafsson.


 src/interfaces/libpq/libpq-fe.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/interfaces/libpq/libpq-fe.h b/src/interfaces/libpq/libpq-fe.h
index c9e6ac2b769..29799046cf2 100644
--- a/src/interfaces/libpq/libpq-fe.h
+++ b/src/interfaces/libpq/libpq-fe.h
@@ -620,10 +620,12 @@ extern int	pg_valid_server_encoding_id(int encoding);
 /* == in fe-secure-openssl.c === */
 
 /* Support for overriding sslpassword handling with a callback. */
+#ifdef USE_OPENSSL
 typedef int (*PQsslKeyPassHook_type)(char *buf, int size, PGconn *conn);
 extern PQsslKeyPassHook_type PQgetSSLKeyPassHook(void);
 extern void PQsetSSLKeyPassHook(PQsslKeyPassHook_type hook);
 extern int PQdefaultSSLKeyPassHook(char *buf, int size, PGconn *conn);
+#endif
 
 #ifdef __cplusplus
 }


[parent: 3125a5baec1c]