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 @@
+20050725
+ - (dtucker) [configure.ac] Update zlib version check for CAN-2005-2096.
+
 20050717
 - OpenBSD CVS Sync
    - djm@cvs.openbsd.org 2005/07/16 01:35:24
@@ -2858,4 +2861,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3853 2005/07/17 07:53:31 djm Exp $
+$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 @@
-# $Id: configure.ac,v 1.278 2005/07/14 07:22:11 dtucker Exp $
+# $Id: configure.ac,v 1.279 2005/07/25 05:24:21 dtucker Exp $
 #
 # Copyright (c) 1999-2004 Damien Miller
 #
@@ -796,8 +796,8 @@ int main()
         if (a == 1 && b == 1 && c >= 4)
                 exit(0);
 
-        /* 1.2.1.2 and up are OK */
-        if (v >= 1020102)
+        /* 1.2.3 and up are OK */
+        if (v >= 1020300)
                 exit(0);
 
         exit(2);