1 files changed, 4 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 1b5e78a42..d19da34ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,10 @@
      [channels.c channels.h servconf.c]
      Add PermitOpen none option based on patch from Loganaden Velvindron
      (bz #1949).  ok djm@
+   - djm@cvs.openbsd.org 2012/04/11 13:16:19
+     [channels.c channels.h clientloop.c serverloop.c]
+     don't spin in accept() when out of fds (ENFILE/ENFILE) - back off for a
+     while; ok deraadt@ markus@
 
 20120420
  - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec]