From 4e8aa4da57000c7bba8e5c49163bc0c0ca383f78 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@debian.org>
Date: Mon, 24 Jan 2011 11:40:46 +0000
Subject: import openssh-5.6p1-gsskex-all-20110101.patch

---
 ChangeLog.gssapi | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

(limited to 'ChangeLog.gssapi')

diff --git a/ChangeLog.gssapi b/ChangeLog.gssapi
index 0c3f5a44f..f117a336a 100644
--- a/ChangeLog.gssapi
+++ b/ChangeLog.gssapi
@@ -1,10 +1,20 @@
+20110101
+  - Finally update for OpenSSH 5.6p1
+  - Add GSSAPIServerIdentity option from Jim Basney
+ 
+20100308
+  - [ Makefile.in, key.c, key.h ]
+    Updates for OpenSSH 5.4p1
+  - [ servconf.c ]
+    Include GSSAPI options in the sshd -T configuration dump, and flag
+    some older configuration options as being unsupported. Thanks to Colin 
+    Watson.
+  -
+
 20100124
   - [ sshconnect2.c ]
     Adapt to deal with additional element in Authmethod structure. Thanks to
-    Colin Wilson
-  - [ clientloop.c ]
-    Protect credentials updated code with suitable #ifdefs. Thanks to Colin
-    Wilson
+    Colin Watson
 
 20090615
   - [ gss-genr.c gss-serv.c kexgssc.c kexgsss.c monitor.c sshconnect2.c
-- 
cgit v1.2.3