diff --git a/doc/src/sgml/libpq.sgml b/doc/src/sgml/libpq.sgml index 5a48c39b562..4325946cca3 100644 --- a/doc/src/sgml/libpq.sgml +++ b/doc/src/sgml/libpq.sgml @@ -1867,24 +1867,6 @@ char *PQpass(const PGconn *conn); - - PQsslpasswordPQsslpassword - - - - Returns the password for the SSL client key. - -char *PQsslpassword(const PGconn *conn); - - - - - will return the SSL password specified - in the connection parameters. - - - - PQhostPQhost diff --git a/src/interfaces/libpq/exports.txt b/src/interfaces/libpq/exports.txt index 53f8ee0fc4b..5fc1e5d2894 100644 --- a/src/interfaces/libpq/exports.txt +++ b/src/interfaces/libpq/exports.txt @@ -176,7 +176,6 @@ PQresultMemorySize 173 PQhostaddr 174 PQgssEncInUse 175 PQgetgssctx 176 -PQsslpassword 177 -PQsetSSLKeyPassHook 178 -PQgetSSLKeyPassHook 179 -PQdefaultSSLKeyPassHook 180 +PQsetSSLKeyPassHook 177 +PQgetSSLKeyPassHook 178 +PQdefaultSSLKeyPassHook 179 diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c index 5c786360a96..66a91286056 100644 --- a/src/interfaces/libpq/fe-connect.c +++ b/src/interfaces/libpq/fe-connect.c @@ -6550,14 +6550,6 @@ PQport(const PGconn *conn) return ""; } -char * -PQsslpassword(const PGconn *conn) -{ - if (!conn) - return NULL; - return conn->sslpassword; -} - char * PQtty(const PGconn *conn) { diff --git a/src/interfaces/libpq/libpq-fe.h b/src/interfaces/libpq/libpq-fe.h index f39db7780c3..75608dd92d9 100644 --- a/src/interfaces/libpq/libpq-fe.h +++ b/src/interfaces/libpq/libpq-fe.h @@ -317,7 +317,6 @@ extern char *PQpass(const PGconn *conn); extern char *PQhost(const PGconn *conn); extern char *PQhostaddr(const PGconn *conn); extern char *PQport(const PGconn *conn); -extern char *PQsslpassword(const PGconn *conn); extern char *PQtty(const PGconn *conn); extern char *PQoptions(const PGconn *conn); extern ConnStatusType PQstatus(const PGconn *conn);