1 files changed, 6 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 78a67e6b7..8387604d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 20050726
  - (dtucker) [configure.ac] Update zlib warning message too, pointed out by
    tim@.
+ - (djm) OpenBSD CVS Sync
+   - otto@cvs.openbsd.org 2005/07/19 15:32:26
+     [auth-passwd.c]
+     auth_usercheck(3) can return NULL, so check for that. Report from
+     mpech@. ok markus@
 
 20050725
  - (dtucker) [configure.ac] Update zlib version check for CAN-2005-2096.
@@ -2865,4 +2870,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.3855 2005/07/26 02:00:42 dtucker Exp $
+$Id: ChangeLog,v 1.3856 2005/07/26 11:54:11 djm Exp $