From owner-svn-src-head@FreeBSD.ORG  Thu Mar  7 14:38:44 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id BD838917;
 Thu,  7 Mar 2013 14:38:44 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id A5D48E71;
 Thu,  7 Mar 2013 14:38:44 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r27EciXw088586;
 Thu, 7 Mar 2013 14:38:44 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r27EciLY088584;
 Thu, 7 Mar 2013 14:38:44 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <201303071438.r27EciLY088584@svn.freebsd.org>
From: Dag-Erling Smørgrav <des@FreeBSD.org>
Date: Thu, 7 Mar 2013 14:38:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r247916 - head/crypto/openssh
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 07 Mar 2013 14:38:44 -0000

Author: des
Date: Thu Mar  7 14:38:43 2013
New Revision: 247916
URL: http://svnweb.freebsd.org/changeset/base/247916

Log:
  Partially revert r247892 and r247904 since our strnvis() does not
  behave the way OpenSSH expects.

Modified:
  head/crypto/openssh/config.h
  head/crypto/openssh/ssh_namespace.h

Modified: head/crypto/openssh/config.h
==============================================================================
--- head/crypto/openssh/config.h	Thu Mar  7 13:26:54 2013	(r247915)
+++ head/crypto/openssh/config.h	Thu Mar  7 14:38:43 2013	(r247916)
@@ -956,7 +956,7 @@
 #define HAVE_STRNLEN 1
 
 /* Define to 1 if you have the `strnvis' function. */
-#define HAVE_STRNVIS 1
+/* #undef HAVE_STRNVIS */
 
 /* Define to 1 if you have the `strptime' function. */
 #define HAVE_STRPTIME 1
@@ -1196,7 +1196,7 @@
 /* #undef HAVE_VHANGUP */
 
 /* Define to 1 if you have the <vis.h> header file. */
-#define HAVE_VIS_H 1
+/* #undef HAVE_VIS_H */
 
 /* Define to 1 if you have the `vsnprintf' function. */
 #define HAVE_VSNPRINTF 1

Modified: head/crypto/openssh/ssh_namespace.h
==============================================================================
--- head/crypto/openssh/ssh_namespace.h	Thu Mar  7 13:26:54 2013	(r247915)
+++ head/crypto/openssh/ssh_namespace.h	Thu Mar  7 14:38:43 2013	(r247916)
@@ -451,6 +451,9 @@
 #define start_progress_meter			ssh_start_progress_meter
 #define stop_progress_meter			ssh_stop_progress_meter
 #define strdelim				ssh_strdelim
+#define strnvis					ssh_strnvis
+#define strvis					ssh_strvis
+#define strvisx					ssh_strvisx
 #define sys_tun_open				ssh_sys_tun_open
 #define temporarily_use_uid			ssh_temporarily_use_uid
 #define tilde_expand_filename			ssh_tilde_expand_filename