- djm@cvs.openbsd.org 2010/01/12 00:58:25

[openssh.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index a9ae9ea3e162c18d0c9d1186858bff42508185bc..a6b547198cb63d7817ac81e1204ba312970d1151 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,14 @@
      [ssh-keygen.c]
      when converting keys, truncate key comments at 72 chars as per RFC4716;
      bz#1630 reported by tj AT castaglia.org; ok markus@
+   - dtucker@cvs.openbsd.org 2010/01/12 00:16:47
+     [authfile.c]
+     Fix bug introduced in r1.78 (incorrect brace location) that broke key auth.
+     Patch from joachim joachimschipper nl.
+   - djm@cvs.openbsd.org 2010/01/12 00:58:25
+     [monitor_fdpass.c]
+     avoid spinning when fd passing on nonblocking sockets by calling poll()
+     in the EINTR/EAGAIN path, much like we do in atomicio; ok dtucker@
 
 20100110
  - (dtucker) [configure.ac misc.c readconf.c servconf.c ssh-keyscan.c]