summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Rice <tim@multitalents.net>2005-08-30 07:12:02 -0700
committerTim Rice <tim@multitalents.net>2005-08-30 07:12:02 -0700
commiteb456545fd5365297ede22d28afbedcc1eb3d482 (patch)
tree84735949a97a94ecf7a57640ab1d25100a86a534
parent2016865b954c83ddcdc76ebeef3a5fe3dfd6d9d2 (diff)
- (tim) [configure.ac] Back out last change. It needs to be done differently.
-rw-r--r--ChangeLog5
-rw-r--r--configure.ac8
2 files changed, 7 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 9f92885b1..3b3ec2bcc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
120050830
2 - (tim) [configure.ac] Back out last change. It needs to be done differently.
3
120050829 420050829
2 - (tim) [configure.ac] ia_openinfo() seems broken on OSR6. Limit UW long 5 - (tim) [configure.ac] ia_openinfo() seems broken on OSR6. Limit UW long
3 password support to 7.x for now. 6 password support to 7.x for now.
@@ -2965,4 +2968,4 @@
2965 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 2968 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
2966 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 2969 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
2967 2970
2968$Id: ChangeLog,v 1.3880 2005/08/30 00:17:37 tim Exp $ 2971$Id: ChangeLog,v 1.3881 2005/08/30 14:12:02 tim Exp $
diff --git a/configure.ac b/configure.ac
index d20ec1507..2834c5802 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.290 2005/08/30 00:17:38 tim Exp $ 1# $Id: configure.ac,v 1.291 2005/08/30 14:12:02 tim Exp $
2# 2#
3# Copyright (c) 1999-2004 Damien Miller 3# Copyright (c) 1999-2004 Damien Miller
4# 4#
@@ -446,6 +446,8 @@ mips-sony-bsd|mips-sony-newsos4)
446 ;; 446 ;;
447# UnixWare 7.x, OpenUNIX 8 447# UnixWare 7.x, OpenUNIX 8
448*-*-sysv5*) 448*-*-sysv5*)
449 check_for_libcrypt_later=1
450 AC_DEFINE(UNIXWARE_LONG_PASSWORDS, 1, [Support passwords > 8 chars])
449 AC_DEFINE(USE_PIPES) 451 AC_DEFINE(USE_PIPES)
450 AC_DEFINE(SETEUID_BREAKS_SETUID) 452 AC_DEFINE(SETEUID_BREAKS_SETUID)
451 AC_DEFINE(BROKEN_SETREUID) 453 AC_DEFINE(BROKEN_SETREUID)
@@ -455,10 +457,6 @@ mips-sony-bsd|mips-sony-newsos4)
455 *-*-sysv5SCO_SV*) # SCO OpenServer 6.x 457 *-*-sysv5SCO_SV*) # SCO OpenServer 6.x
456 TEST_SHELL=/u95/bin/sh 458 TEST_SHELL=/u95/bin/sh
457 ;; 459 ;;
458 *-*-sysv5*)
459 check_for_libcrypt_later=1
460 AC_DEFINE(UNIXWARE_LONG_PASSWORDS, 1, [Support passwords > 8 chars])
461 ;;
462 esac 460 esac
463 ;; 461 ;;
464*-*-sysv*) 462*-*-sysv*)