From: Noah Misch <noah@leadboat.com>
Date: Fri, 18 Jul 2014 20:05:17 +0000 (-0400)
Subject: Limit pg_upgrade authentication advice to always-secure techniques.
X-Git-Tag: REL9_2_9~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9cef05e0f53933ab54a99224fcba5ab2abf2b8a8;p=thirdparty%2Fpostgresql.git

Limit pg_upgrade authentication advice to always-secure techniques.

~/.pgpass is a sound choice everywhere, and "peer" authentication is
safe on every platform it supports.  Cease to recommend "trust"
authentication, the safety of which is deeply configuration-specific.
Back-patch to 9.0, where pg_upgrade was introduced.
---

diff --git a/doc/src/sgml/pgupgrade.sgml b/doc/src/sgml/pgupgrade.sgml
index c628b49d8b1..2a3844984fb 100644
--- a/doc/src/sgml/pgupgrade.sgml
+++ b/doc/src/sgml/pgupgrade.sgml
@@ -280,10 +280,9 @@ gmake prefix=/usr/local/pgsql.new install
     <title>Adjust authentication</title>
 
     <para>
-     <command>pg_upgrade</> will connect to the old and new servers several times,
-     so you might want to set authentication to <literal>trust</>
-     or <literal>peer</> in <filename>pg_hba.conf</>, or if using
-     <literal>md5</> authentication, use a <filename>~/.pgpass</> file
+     <command>pg_upgrade</> will connect to the old and new servers several
+     times, so you might want to set authentication to <literal>peer</>
+     in <filename>pg_hba.conf</> or use a <filename>~/.pgpass</> file
      (see <xref linkend="libpq-pgpass">).
     </para>
    </step>
@@ -390,10 +389,9 @@ pg_upgrade.exe
     <title>Restore <filename>pg_hba.conf</></title>
 
     <para>
-     If you modified <filename>pg_hba.conf</> to use <literal>trust</>,
-     restore its original authentication settings.  It might also be
-     necessary to adjust other configurations files in the new cluster to
-     match the old cluster, e.g. <filename>postgresql.conf</>.
+     If you modified <filename>pg_hba.conf</>, restore its original settings.
+     It might also be necessary to adjust other configuration files in the new
+     cluster to match the old cluster, e.g. <filename>postgresql.conf</>.
     </para>
    </step>