Remove PQsslpassword function

This partially reverts commit 4dc6355210.

The information returned by the function can be obtained by calling
PQconninfo(), so the function is redundant.

diff --git a/doc/src/sgml/libpq.sgml b/doc/src/sgml/libpq.sgml
index 5a48c39b562bcba9e0ffbefd93fb38b2b4238c23..4325946cca3b07374df19e5e152da78017edc890 100644 (file)
--- a/doc/src/sgml/libpq.sgml
+++ b/doc/src/sgml/libpq.sgml
@@ -1867,24 +1867,6 @@ char *PQpass(const PGconn *conn);
      </listitem>
     </varlistentry>
 
-    <varlistentry id="libpq-PQsslpassword">
-     <term><function>PQsslpassword</function><indexterm><primary>PQsslpassword</primary></indexterm></term>
-
-     <listitem>
-      <para>
-       Returns the password for the SSL client key.
-<synopsis>
-char *PQsslpassword(const PGconn *conn);
-</synopsis>
-      </para>
-
-      <para>
-       <xref linkend="libpq-PQsslpassword"/> will return the SSL password specified
-       in the connection parameters.
-      </para>
-     </listitem>
-    </varlistentry>
-
     <varlistentry id="libpq-PQhost">
      <term><function>PQhost</function><indexterm><primary>PQhost</primary></indexterm></term>
 

diff --git a/src/interfaces/libpq/exports.txt b/src/interfaces/libpq/exports.txt
index 53f8ee0fc4b342c64c8716815fdad8c1e05eda54..5fc1e5d28946d1497d98dc323442575dbcd9d572 100644 (file)
--- 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 5c786360a96401b8cb373eaadc5f2ef40bd34d19..66a912860564d98a1376097ffc114f0e6a157e30 100644 (file)
--- 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 f39db7780c389ca4188aba09101de849c818bdff..75608dd92d9f76589c1cf208bce29586a3052ffb 100644 (file)
--- 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);