diff options
| author | des <des@FreeBSD.org> | 2013-03-07 14:38:43 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2013-03-07 14:38:43 +0000 |
| commit | 138ec63f93366c0d530aa60d1a472877e1c7d95b (patch) | |
| tree | 4560fffbfaa2b947c01b8e3563f550d72ce63d3a /crypto | |
| parent | f6f6d82fce50e77b47d7e853154183007141f011 (diff) | |
| download | FreeBSD-src-138ec63f93366c0d530aa60d1a472877e1c7d95b.zip FreeBSD-src-138ec63f93366c0d530aa60d1a472877e1c7d95b.tar.gz | |
Partially revert r247892 and r247904 since our strnvis() does not
behave the way OpenSSH expects.
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/openssh/config.h | 4 | ||||
| -rw-r--r-- | 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 614c2aa..782708b 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 <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 diff --git a/crypto/openssh/ssh_namespace.h b/crypto/openssh/ssh_namespace.h index 5b22131..f5935e6 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 |
