From: Paul Park <pjpark@mit.edu>
Date: Mon, 7 Aug 1995 21:43:50 +0000 (+0000)
Subject: Describe previous changes
X-Git-Tag: krb5-1.0-beta6~1383
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b9f36345dcad3860c1e78a31886ef8a5972e1574;p=krb5.git

Describe previous changes

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6441 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/kadmin/v5server/ChangeLog b/src/kadmin/v5server/ChangeLog
index b8845c39e..5eb743902 100644
--- a/src/kadmin/v5server/ChangeLog
+++ b/src/kadmin/v5server/ChangeLog
@@ -1,4 +1,10 @@
 
+Mon Aug 7 17:34:52 EDT 1995	Paul Park	(pjpark@mit.edu)
+	* admin.c - Fix key list merging so that key version numbers are
+		generated and merged correctly.
+	* srv_key.c - Handle V4 salttype correctly.
+
+
 Fri Aug 4 16:14:36 EDT 1995	Paul Park	(pjpark@mit.edu)
 	* admin.c - Add support for "ADD-KEY" and "DELETE-KEY" protocol requests
 		as well as adding the ability to keep previous random keys