summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--UPGRADING8
-rw-r--r--configure.in3
3 files changed, 14 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ea454f5e1..30421b726 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,10 @@
3 3
4 - NeXT keeps it lastlog in /usr/adm. Report from 4 - NeXT keeps it lastlog in /usr/adm. Report from
5 mouring@newton.pconline.com 5 mouring@newton.pconline.com
6 - Added note in UPGRADING re interop with commercial SSH using idea.
7 Report from Jim Knoble <jmknoble@pobox.com>
8 - Fix linking order for Kerberos/AFS. Fix from Holget Trapp
9 <Holger.Trapp@Informatik.TU-Chemnitz.DE>
6 10
720000125 1120000125
8 - Fix NULL pointer dereference in login.c. Fix from Andre Lucas 12 - Fix NULL pointer dereference in login.c. Fix from Andre Lucas
diff --git a/UPGRADING b/UPGRADING
index 54f5ca66f..5c6715ce2 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -96,3 +96,11 @@ with the --with-ipv4-default configure option. This instructs OpenSSH to
96use IPv4-only address resolution. (IPv6 lookups may still be made by 96use IPv4-only address resolution. (IPv6 lookups may still be made by
97specifying the -6 option). 97specifying the -6 option).
98 98
9910. Logins from commercial ssh generate the error "Selected cipher type
100 idea not supported by server"
101
102This error is generated when a commercial ssh which has been configured to
103use the 'idea' cipher attempts to connect to an OpenSSH server. To rectify
104this, select a different cipher in ssh_config or ~/.ssh/config (3des for
105security or blowfish for speed).
106
diff --git a/configure.in b/configure.in
index 6423b62e2..2ff4aba59 100644
--- a/configure.in
+++ b/configure.in
@@ -630,7 +630,7 @@ AC_ARG_WITH(kerberos4,
630 AC_MSG_WARN([Cannot find libkrb, build may fail]) 630 AC_MSG_WARN([Cannot find libkrb, build may fail])
631 fi 631 fi
632 632
633 LIBS="$LIBS -lkrb -ldes" 633 KLIBS="-lkrb -ldes"
634 AC_CHECK_LIB(resolv, dn_expand, , ) 634 AC_CHECK_LIB(resolv, dn_expand, , )
635 KRB4=yes 635 KRB4=yes
636 AC_DEFINE(KRB4) 636 AC_DEFINE(KRB4)
@@ -661,6 +661,7 @@ AC_ARG_WITH(afs,
661 fi 661 fi
662 ] 662 ]
663) 663)
664LIBS="$LIBS $KLIBS"
664 665
665dnl Check whether user wants S/Key support 666dnl Check whether user wants S/Key support
666AC_ARG_WITH(skey, 667AC_ARG_WITH(skey,