From 29911fcaccbad6650f0e0f53522446aad7a4d239 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dag-Erling=20Sm=C3=B8rgrav?= Date: Thu, 7 Mar 2013 14:38:43 +0000 Subject: [PATCH] Partially revert r247892 and r247904 since our strnvis() does not behave the way OpenSSH expects. --- crypto/openssh/config.h | 4 ++-- crypto/openssh/ssh_namespace.h | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/crypto/openssh/config.h b/crypto/openssh/config.h index 614c2aa23ee1..782708b74b25 100644 --- a/crypto/openssh/config.h +++ b/crypto/openssh/config.h @@ -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 header file. */ -#define HAVE_VIS_H 1 +/* #undef HAVE_VIS_H */ /* Define to 1 if you have the `vsnprintf' function. */ #define HAVE_VSNPRINTF 1 diff --git a/crypto/openssh/ssh_namespace.h b/crypto/openssh/ssh_namespace.h index 5b22131a4e04..f5935e6d1ae3 100644 --- a/crypto/openssh/ssh_namespace.h +++ b/crypto/openssh/ssh_namespace.h @@ -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