From: Darren Tucker <dtucker@zip.com.au>
Date: Sun, 19 Jan 2014 11:36:13 +0000 (+1100)
Subject:    - djm@cvs.openbsd.org 2014/01/19 04:48:08
X-Git-Tag: V_6_5_P1~31
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b7e01c09b56ab26e8fac56bbce0fd25e36d12bb0;p=thirdparty%2Fopenssh-portable.git

   - djm@cvs.openbsd.org 2014/01/19 04:48:08
     [ssh_config.5]
     fix inverted meaning of 'no' and 'yes' for CanonicalizeFallbackLocal
---

diff --git a/ChangeLog b/ChangeLog
index 847be1460..990739468 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,9 @@
      Cast socklen_t when comparing to size_t and use socklen_t to iterate over
      the ip options, both to prevent signed/unsigned comparison warnings.
      Patch from vinschen at redhat via portable openssh, begrudging ok deraadt.
+   - djm@cvs.openbsd.org 2014/01/19 04:48:08
+     [ssh_config.5]
+     fix inverted meaning of 'no' and 'yes' for CanonicalizeFallbackLocal
 
 20140118
  - (dtucker) [uidswap.c] Prevent unused variable warnings on Cygwin.  Patch
diff --git a/ssh_config.5 b/ssh_config.5
index 7b2fdacbb..3cadcd767 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -33,8 +33,8 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: ssh_config.5,v 1.183 2013/12/07 11:58:46 naddy Exp $
-.Dd $Mdocdate: December 7 2013 $
+.\" $OpenBSD: ssh_config.5,v 1.184 2014/01/19 04:48:08 djm Exp $
+.Dd $Mdocdate: January 19 2014 $
 .Dt SSH_CONFIG 5
 .Os
 .Sh NAME
@@ -229,11 +229,11 @@ search for the specified destination host.
 .It Cm CanonicalizeFallbackLocal
 Specifies whether to fail with an error when hostname canonicalization fails.
 The default,
-.Dq no ,
+.Dq yes ,
 will attempt to look up the unqualified hostname using the system resolver's
 search rules.
 A value of
-.Dq yes
+.Dq no
 will cause
 .Xr ssh 1
 to fail instantly if