From c65e4cd5857c871d0ac31eacf2be364dacf52b2f Mon Sep 17 00:00:00 2001
From: Johan Danielsson <joda@pdc.kth.se>
Date: Sat, 16 Dec 2000 00:45:34 +0000
Subject: [PATCH] x

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

diff --git a/ChangeLog b/ChangeLog
index f358e50c7..246a72f71 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-12-16  Johan Danielsson  <joda@pdc.kth.se>
+
+	* admin/copy.c: don't copy an entry that already exists in the
+	keytab, and warn if the keyblock differs
+
 2000-12-15  Johan Danielsson  <joda@pdc.kth.se>
 
 	* admin/Makefile.am: merge srvconvert and srvcreate with copy