From 9bc15736ff975e118643e18e9da7f91c0960b7b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= <lha@kth.se>
Date: Fri, 22 Sep 2006 10:42:16 +0000
Subject: [PATCH] x

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@18148 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 lib/gssapi/ChangeLog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/gssapi/ChangeLog b/lib/gssapi/ChangeLog
index 33f758b36..67a7471c1 100644
--- a/lib/gssapi/ChangeLog
+++ b/lib/gssapi/ChangeLog
@@ -1,3 +1,9 @@
+2006-09-22  Love Hörnquist Åstrand  <lha@it.su.se>
+
+	* krb5/{init_sec_context.c,gsskrb5_locl.h}: merge most of the
+	initiator part from the samba patch by Stefan Metzmacher and
+	Andrew Bartlet (still missing DCE/RPC support)
+
 2006-08-28  Love Hörnquist Åstrand  <lha@it.su.se>
 
 	* gss.c (help): use sl_slc_help().