Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Revert "Only provide new libpq sslpasskey hook for openssl-enabled builds"
authorAndrew Dunstan <andrew@dunslane.net>
Fri, 17 Apr 2020 20:53:01 +0000 (16:53 -0400)
committerAndrew Dunstan <andrew@dunslane.net>
Fri, 17 Apr 2020 20:53:01 +0000 (16:53 -0400)
This reverts commit 9e24109f1a4e4d8d1d372b004d6a0dd06e673fe7.

This caused build errors when building without openssl, and it's
simplest just to revert it.

src/interfaces/libpq/libpq-fe.h

index 29799046cf201ba2dde8880a7d5cfe7d9e0ad3ab..c9e6ac2b7699e4e647bd161ee87d01726c5078a7 100644 (file)
@@ -620,12 +620,10 @@ 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
 }