From 1be05e656851f3dd4afaef9e16f20fbf42df8dca Mon Sep 17 00:00:00 2001
From: Love Hornquist Astrand <lha@h5l.org>
Date: Sat, 27 Nov 2010 13:27:35 -0800
Subject: [PATCH] support KRB5_KDB_SALTTYPE_CERTHASH

---
 lib/hdb/hdb-mitdb.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/hdb/hdb-mitdb.c b/lib/hdb/hdb-mitdb.c
index ea626deae..bfd0105ea 100644
--- a/lib/hdb/hdb-mitdb.c
+++ b/lib/hdb/hdb-mitdb.c
@@ -125,6 +125,7 @@ mdb_principal2key(krb5_context context,
 #define KRB5_KDB_SALTTYPE_ONLYREALM	3
 #define KRB5_KDB_SALTTYPE_SPECIAL	4
 #define KRB5_KDB_SALTTYPE_AFS3		5
+#define KRB5_KDB_SALTTYPE_CERTHASH	6
 
 static krb5_error_code
 fix_salt(krb5_context context, hdb_entry *ent, int key_num)
@@ -184,6 +185,11 @@ fix_salt(krb5_context context, hdb_entry *ent, int key_num)
 	    return ret;
 	salt->type = KRB5_PADATA_AFS3_SALT;
 	break;
+    case KRB5_KDB_SALTTYPE_CERTHASH:
+	krb5_data_free(&salt->salt);
+	free(ent->keys.val[key_num].salt);
+	ent->keys.val[key_num].salt = NULL;
+	break;
     default:
 	abort();
     }