From 08730652fbf1c9f6d53378b1b094a2c5ddf2cf62 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Sat, 27 Aug 2005 11:49:06 +0000
Subject: r9680: Update Heimdal to current lorikeet-heimdal (which was itself
 updated to Heimdal CVS as of 2005-08-27).

Andrew Bartlett
(This used to be commit 913924a4997f5e14c503f87510cbd8e4bfd965a9)
---
 source4/heimdal/lib/hdb/mkey.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'source4/heimdal/lib/hdb/mkey.c')

diff --git a/source4/heimdal/lib/hdb/mkey.c b/source4/heimdal/lib/hdb/mkey.c
index 9e04dc6d8d..f12f73e809 100644
--- a/source4/heimdal/lib/hdb/mkey.c
+++ b/source4/heimdal/lib/hdb/mkey.c
@@ -36,7 +36,7 @@
 #define O_BINARY 0
 #endif
 
-RCSID("$Id: mkey.c,v 1.20 2005/08/10 08:41:03 lha Exp $");
+RCSID("$Id: mkey.c,v 1.21 2005/08/19 13:07:03 lha Exp $");
 
 struct hdb_master_key_data {
     krb5_keytab_entry keytab;
@@ -486,6 +486,9 @@ hdb_seal_key_mkey(krb5_context context, Key *k, hdb_master_key mkey)
     krb5_data res;
     hdb_master_key key;
 
+    if(k->mkvno != NULL)
+	return 0;
+
     key = _hdb_find_master_key(k->mkvno, mkey);
 
     if (key == NULL)
-- 
cgit