diff options
Diffstat (limited to 'security/ssh2/patches/patch-ad')
| -rw-r--r-- | security/ssh2/patches/patch-ad | 75 |
1 files changed, 66 insertions, 9 deletions
diff --git a/security/ssh2/patches/patch-ad b/security/ssh2/patches/patch-ad index 95c3a37f440..ed8cf533651 100644 --- a/security/ssh2/patches/patch-ad +++ b/security/ssh2/patches/patch-ad @@ -1,13 +1,70 @@ -$NetBSD: patch-ad,v 1.1.1.1 2002/08/06 00:48:14 seb Exp $ +$NetBSD: patch-ad,v 1.2 2003/08/12 19:08:57 seb Exp $ ---- apps/ssh/sshstdiofilter.c.orig Thu May 16 10:32:22 2002 -+++ apps/ssh/sshstdiofilter.c -@@ -301,7 +301,7 @@ void ssh_escape_char_dump_statistics(int +--- configure.in.orig 2003-06-30 12:22:25.000000000 +0000 ++++ configure.in +@@ -1558,9 +1558,7 @@ dnl + *-*-netbsd*) + # no_shadows_password_checking=yes ? + # ^ (see above comment) +- +- # At least NetBSD 1.6 has a nonfunctional utmpx. +- no_utmpx=yes ++ AC_DEFINE(SSH_UTMP_UTMPX) + ;; + *) + ;; +@@ -1791,6 +1789,8 @@ if test -z "$no_libbsd"; then + fi + AC_CHECK_LIB(util, login, AC_DEFINE(HAVE_LIBUTIL_LOGIN) + LIBS="$LIBS -lutil") ++AC_CHECK_LIB(util, loginx, AC_DEFINE(HAVE_LIBUTIL_LOGINX) ++ LIBS="$LIBS -lutil") - #endif /* SSHDIST_SSH2_INTERNAL_SSH1_EMULATION */ + if test -z "$no_vhangup"; then + AC_CHECK_FUNCS(vhangup) +@@ -1942,6 +1942,22 @@ if test "$ac_cv_have_proto_logout" = "ye + fi + AC_MSG_RESULT($ac_cv_have_proto_logout) -- ssh_tcp_get_host_name(local_host_name, MAXHOSTNAMELEN); -+ ssh_tcp_get_host_name(local_host_name, sizeof(local_host_name)); ++AC_MSG_CHECKING([whether there is a prototype for logoutx]) ++AC_CACHE_VAL(ac_cv_have_proto_logoutx, ++ [ AC_TRY_COMPILE(changequote(<<, >>)dnl ++ << $session_wtmp_includes ++/* If someone has a prototype like this for anything, then... well. */ ++void * logoutx(void *, int *, char *, int, char, void *[6][8][10][3][4], ...); ++>>, ++ changequote([, ])dnl ++ [ ; ], ++ ac_cv_have_proto_logoutx=no, ++ ac_cv_have_proto_logoutx=yes)]) ++if test "$ac_cv_have_proto_logoutx" = "yes"; then ++ AC_DEFINE(HAVE_PROTO_LOGOUTX) ++fi ++AC_MSG_RESULT($ac_cv_have_proto_logoutx) ++ + AC_MSG_CHECKING([whether there is a prototype for logwtmp]) + AC_CACHE_VAL(ac_cv_have_proto_logwtmp, + [ AC_TRY_COMPILE(changequote(<<, >>)dnl +@@ -1958,6 +1974,22 @@ if test "$ac_cv_have_proto_logwtmp" = "y + fi + AC_MSG_RESULT($ac_cv_have_proto_logwtmp) - if (client->config->host_to_connect) - fprintf(stderr, "remote host: %s\n", client->config->host_to_connect); ++AC_MSG_CHECKING([whether there is a prototype for logwtmpx]) ++AC_CACHE_VAL(ac_cv_have_proto_logwtmpx, ++ [ AC_TRY_COMPILE(changequote(<<, >>)dnl ++ << $session_wtmp_includes ++/* If someone has a prototype like this for anything, then... well. */ ++void * logwtmpx(void *, int *, char *, int, char, void *[6][8][10][3][4], ...); ++>>, ++ changequote([, ])dnl ++ [ ; ], ++ ac_cv_have_proto_logwtmpx=no, ++ ac_cv_have_proto_logwtmpx=yes)]) ++if test "$ac_cv_have_proto_logwtmpx" = "yes"; then ++ AC_DEFINE(HAVE_PROTO_LOGWTMPX) ++fi ++AC_MSG_RESULT($ac_cv_have_proto_logwtmpx) ++ + AC_CHECK_FUNCS(initgroups) + + if test "X$ac_cv_func_initgroups" = "Xyes"; then |