svn commit: r247916 - head/crypto/openssh

[Dag-Erling Smørgrav]

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