aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Dunstan <andrew@dunslane.net>2020-04-17 16:53:01 -0400
committerAndrew Dunstan <andrew@dunslane.net>2020-04-17 16:53:01 -0400
commit6741cfa5964768279a13e01e46931664fe0903a4 (patch)
tree534eee2d1557adf2375af5e587c6f5fa8acbc880
parentf342d7ad03e61a1cea0339cf0c5aea0d01c3b43e (diff)
downloadpostgresql-6741cfa5964768279a13e01e46931664fe0903a4.tar.gz
postgresql-6741cfa5964768279a13e01e46931664fe0903a4.zip
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.
-rw-r--r--src/interfaces/libpq/libpq-fe.h2
1 files changed, 0 insertions, 2 deletions
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
}