summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2000-01-06 12:03:12 +1100
committerDamien Miller <djm@mindrot.org>2000-01-06 12:03:12 +1100
commit1808f38e04dc386bd2caacffe0192d62c1a70286 (patch)
treecace20a20ba0837b347241ae23aa4f428245b9fc
parent62ab38ab9e5bae5b516ff10ab62ef55a2592059a (diff)
- Fixed annoying DES corruption problem. libcrypt has been
overriding symbols in libcrypto. Removed libcrypt and crypt.h altogether (libcrypto includes its own crypt(1) replacement) - Added platform-specific rules for Irix 6.x. Included warning that they are untested.
-rw-r--r--ChangeLog7
-rw-r--r--acconfig.h3
-rw-r--r--auth-passwd.c5
-rw-r--r--configure.in10
4 files changed, 14 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 10e92dd0..76b692c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+20000105
+ - Fixed annoying DES corruption problem. libcrypt has been
+ overriding symbols in libcrypto. Removed libcrypt and crypt.h
+ altogether (libcrypto includes its own crypt(1) replacement)
+ - Added platform-specific rules for Irix 6.x. Included warning that
+ they are untested.
+
20000103
- Add explicit make rules for files proccessed by fixpaths.
- Fix "make install" in RPM spec files. Report from Tenkou N. Hattori
diff --git a/acconfig.h b/acconfig.h
index c66983e6..e61bfd33 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -138,9 +138,6 @@
/* Specify default $PATH */
#undef USER_PATH
-/* Define if the inclusion of crypt.h breaks the build (e.g. Irix 5.x) */
-#undef CRYPT_H_BREAKS_BUILD
-
@BOTTOM@
/* ******************* Shouldn't need to edit below this line ************** */
diff --git a/auth-passwd.c b/auth-passwd.c
index c3347030..a8a52ce9 100644
--- a/auth-passwd.c
+++ b/auth-passwd.c
@@ -11,7 +11,7 @@
#ifndef USE_PAM
-RCSID("$Id: auth-passwd.c,v 1.14 1999/12/30 21:49:13 damien Exp $");
+RCSID("$Id: auth-passwd.c,v 1.15 2000/01/06 01:03:13 damien Exp $");
#include "packet.h"
#include "ssh.h"
@@ -21,9 +21,6 @@ RCSID("$Id: auth-passwd.c,v 1.14 1999/12/30 21:49:13 damien Exp $");
#ifdef HAVE_SHADOW_H
# include <shadow.h>
#endif
-#if defined(HAVE_CRYPT_H) && !defined(CRYPT_H_BREAKS_BUILD)
-# include <crypt.h>
-#endif /* defined(HAVE_CRYPT_H) && !defined(CRYPT_H_BREAKS_BUILD) */
#if defined(HAVE_MD5_PASSWORDS) && !defined(HAVE_MD5_CRYPT)
# include "md5crypt.h"
#endif /* defined(HAVE_MD5_PASSWORDS) && !defined(HAVE_MD5_CRYPT) */
diff --git a/configure.in b/configure.in
index 34c4dfaf..7480349a 100644
--- a/configure.in
+++ b/configure.in
@@ -61,8 +61,11 @@ case "$host" in
AC_DEFINE(USE_UTMPX)
;;
*-*-irix5*)
- AC_DEFINE(CRYPT_H_BREAKS_BUILD)
-# CFLAGS="$CFLAGS -shared"
+ no_libsocket=1
+ no_libnsl=1
+ ;;
+*-*-irix6*)
+ AC_MSG_WARN([*** Irix 6.x is not tested *** ])
no_libsocket=1
no_libnsl=1
;;
@@ -106,7 +109,6 @@ dnl Checks for libraries.
AC_CHECK_LIB(crypto, CRYPTO_lock, ,AC_MSG_ERROR([*** libcrypto missing - please install first ***]))
AC_CHECK_LIB(z, deflate, ,AC_MSG_ERROR([*** zlib missing - please install first ***]))
AC_CHECK_LIB(util, login, AC_DEFINE(HAVE_LIBUTIL_LOGIN) LIBS="$LIBS -lutil")
-AC_CHECK_LIB(crypt, crypt, , )
if test -z "$no_libsocket" ; then
AC_CHECK_LIB(nsl, yp_match, , )
@@ -116,7 +118,7 @@ if test -z "$no_libnsl" ; then
fi
dnl Checks for header files.
-AC_CHECK_HEADERS(bstring.h crypt.h endian.h lastlog.h login.h maillock.h netdb.h netgroup.h paths.h poll.h pty.h shadow.h security/pam_appl.h sys/bsdtty.h sys/cdefs.h sys/poll.h sys/select.h sys/stropts.h sys/time.h sys/ttcompat.h util.h utmp.h utmpx.h)
+AC_CHECK_HEADERS(bstring.h endian.h lastlog.h login.h maillock.h netdb.h netgroup.h paths.h poll.h pty.h shadow.h security/pam_appl.h sys/bsdtty.h sys/cdefs.h sys/poll.h sys/select.h sys/stropts.h sys/time.h sys/ttcompat.h util.h utmp.h utmpx.h)
dnl Checks for library functions.
AC_CHECK_FUNCS(arc4random getpagesize _getpty innetgr md5_crypt mkdtemp openpty setenv seteuid setlogin setproctitle setreuid snprintf strlcat strlcpy updwtmpx vsnprintf)