From: Andrew Dunstan <andrew@dunslane.net>
Date: Fri, 17 Apr 2020 20:53:01 +0000 (-0400)
Subject: Revert "Only provide new libpq sslpasskey hook for openssl-enabled builds"
X-Git-Tag: REL_13_BETA1~226
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6741cfa5964768279a13e01e46931664fe0903a4;p=thirdparty%2Fpostgresql.git

Revert "Only provide new libpq sslpasskey hook for openssl-enabled builds"

This reverts commit 9e24109f1a4e4d8d1d372b004d6a0dd06e673fe7.

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

diff --git a/src/interfaces/libpq/libpq-fe.h b/src/interfaces/libpq/libpq-fe.h
index 29799046cf2..c9e6ac2b769 100644
--- a/src/interfaces/libpq/libpq-fe.h
+++ b/src/interfaces/libpq/libpq-fe.h
@@ -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
 }