From e1c1cdb1b685624a929fba0788372841f9a44bd9 Mon Sep 17 00:00:00 2001
From: Viktor Dukhovni <viktor@twosigma.com>
Date: Mon, 14 Nov 2016 14:56:46 +1100
Subject: [PATCH] HDB compiler warnings

---
 lib/hdb/hdb-ldap.c | 12 ++++++++----
 lib/hdb/mkey.c     |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/lib/hdb/hdb-ldap.c b/lib/hdb/hdb-ldap.c
index ed96738ec..509dae6e0 100644
--- a/lib/hdb/hdb-ldap.c
+++ b/lib/hdb/hdb-ldap.c
@@ -1149,16 +1149,18 @@ LDAP_message2entry(krb5_context context, HDB * db, LDAPMessage * msg,
     ret = LDAP_get_string_value(db, msg, "sambaNTPassword", &ntPasswordIN);
     if (ret == 0 && have_arcfour == 0) {
 	unsigned *etypes;
+        Key *ks;
 
-	keys = realloc(ent->entry.keys.val,
-		       (ent->entry.keys.len + 1) * sizeof(ent->entry.keys.val[0]));
-	if (keys == NULL) {
+	ks = realloc(ent->entry.keys.val,
+		     (ent->entry.keys.len + 1) *
+                     sizeof(ent->entry.keys.val[0]));
+	if (ks == NULL) {
 	    free(ntPasswordIN);
 	    ret = ENOMEM;
 	    krb5_set_error_message(context, ret, "malloc: out of memory");
 	    goto out;
 	}
-	ent->entry.keys.val = keys;
+	ent->entry.keys.val = ks;
 	memset(&ent->entry.keys.val[ent->entry.keys.len], 0, sizeof(Key));
 	ent->entry.keys.val[ent->entry.keys.len].key.keytype = ETYPE_ARCFOUR_HMAC_MD5;
 	ret = krb5_data_alloc (&ent->entry.keys.val[ent->entry.keys.len].key.keyvalue, 16);
@@ -1716,6 +1718,7 @@ LDAP_fetch_kvno(krb5_context context, HDB * db, krb5_const_principal principal,
     return ret;
 }
 
+#if 0
 static krb5_error_code
 LDAP_fetch(krb5_context context, HDB * db, krb5_const_principal principal,
 	   unsigned flags, hdb_entry_ex * entry)
@@ -1723,6 +1726,7 @@ LDAP_fetch(krb5_context context, HDB * db, krb5_const_principal principal,
     return LDAP_fetch_kvno(context, db, principal,
 			   flags & (~HDB_F_KVNO_SPECIFIED), 0, entry);
 }
+#endif
 
 static krb5_error_code
 LDAP_store(krb5_context context, HDB * db, unsigned flags,
diff --git a/lib/hdb/mkey.c b/lib/hdb/mkey.c
index ebfcb76f5..f9ceb7b4b 100644
--- a/lib/hdb/mkey.c
+++ b/lib/hdb/mkey.c
@@ -374,7 +374,7 @@ _hdb_set_master_key_usage(krb5_context context, HDB *db, unsigned int key_usage)
 }
 
 hdb_master_key
-_hdb_find_master_key(int *mkvno, hdb_master_key mkey)
+_hdb_find_master_key(unsigned int *mkvno, hdb_master_key mkey)
 {
     hdb_master_key ret = NULL;
     while(mkey) {