summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--configure.ac6
2 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 21e20138b..98788e90d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
120050725
2 - (dtucker) [configure.ac] Update zlib version check for CAN-2005-2096.
3
120050717 420050717
2- OpenBSD CVS Sync 5- OpenBSD CVS Sync
3 - djm@cvs.openbsd.org 2005/07/16 01:35:24 6 - djm@cvs.openbsd.org 2005/07/16 01:35:24
@@ -2858,4 +2861,4 @@
2858 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 2861 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
2859 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 2862 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
2860 2863
2861$Id: ChangeLog,v 1.3853 2005/07/17 07:53:31 djm Exp $ 2864$Id: ChangeLog,v 1.3854 2005/07/25 05:24:21 dtucker Exp $
diff --git a/configure.ac b/configure.ac
index e3d696cdd..2041bf298 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.278 2005/07/14 07:22:11 dtucker Exp $ 1# $Id: configure.ac,v 1.279 2005/07/25 05:24:21 dtucker Exp $
2# 2#
3# Copyright (c) 1999-2004 Damien Miller 3# Copyright (c) 1999-2004 Damien Miller
4# 4#
@@ -796,8 +796,8 @@ int main()
796 if (a == 1 && b == 1 && c >= 4) 796 if (a == 1 && b == 1 && c >= 4)
797 exit(0); 797 exit(0);
798 798
799 /* 1.2.1.2 and up are OK */ 799 /* 1.2.3 and up are OK */
800 if (v >= 1020102) 800 if (v >= 1020300)
801 exit(0); 801 exit(0);
802 802
803 exit(2); 803 exit(2);