X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/blobdiff_plain/7069a5e25bed88b3399dcab78ff9cb3e1559ef54..e5ba4718e935294079c084d4f8373f002cc25400:/ChangeLog

diff --git a/ChangeLog b/ChangeLog
index eddc5ce9..2abf2d65 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,12 +12,23 @@
      add prototypes for -Wall; ok djm
    - djm@cvs.openbsd.org 2004/05/21 11:33:11
      [channels.c channels.h clientloop.c serverloop.c ssh.1]
-     bz #756: add support for the cancel-tcpip-forward request for the server and
-     the client (through the ~C commandline). reported by z3p AT twistedmatrix.com;
-     ok markus@
+     bz #756: add support for the cancel-tcpip-forward request for the server
+     and the client (through the ~C commandline). reported by z3p AT
+     twistedmatrix.com; ok markus@
    - djm@cvs.openbsd.org 2004/05/22 06:32:12
      [clientloop.c ssh.1]
      use '-h' for help in ~C commandline instead of '-?'; inspired by jmc@
+   - jmc@cvs.openbsd.org 2004/05/22 16:01:05
+     [ssh.1]
+     kill whitespace at eol;
+   - dtucker@cvs.openbsd.org 2004/05/23 23:59:53
+     [auth.c auth.h auth1.c auth2.c servconf.c servconf.h sshd_config
+     sshd_config.5]
+     Add MaxAuthTries sshd config option; ok markus@
+ - (dtucker) [auth-pam.c] Bug #839: Ensure that pam authentication "thread"
+   is terminated if the privsep slave exits during keyboard-interactive
+   authentication.  ok djm@
+ - (dtucker) [sshd.c] Fix typo in comment.
 
 20040523
  - (djm) [sshd_config] Explain consequences of UsePAM=yes a little better in