oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

HDB compiler warnings

Browse Source
This commit is contained in:
Viktor Dukhovni
2016-11-14 14:56:46 +11:00
parent e4ba666221
commit e1c1cdb1b6
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/hdb/hdb-ldap.c
View File

@@ -1149,16 +1149,18 @@ LDAP_message2entry(krb5_context context, HDB * db, LDAPMessage * msg,
ret = LDAP_get_string_value(db, msg, "sambaNTPassword", &ntPasswordIN); ret = LDAP_get_string_value(db, msg, "sambaNTPassword", &ntPasswordIN);
if (ret == 0 && have_arcfour == 0) { if (ret == 0 && have_arcfour == 0) {
unsigned *etypes; unsigned *etypes;
Key *ks;
keys = realloc(ent->entry.keys.val, ks = realloc(ent->entry.keys.val,
(ent->entry.keys.len + 1) * sizeof(ent->entry.keys.val[0])); (ent->entry.keys.len + 1) *
if (keys == NULL) { sizeof(ent->entry.keys.val[0]));
if (ks == NULL) {
free(ntPasswordIN); free(ntPasswordIN);
ret = ENOMEM; ret = ENOMEM;
krb5_set_error_message(context, ret, "malloc: out of memory"); krb5_set_error_message(context, ret, "malloc: out of memory");
goto out; goto out;
} }
ent->entry.keys.val = keys; ent->entry.keys.val = ks;
memset(&ent->entry.keys.val[ent->entry.keys.len], 0, sizeof(Key)); 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; 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); 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; return ret;
} }
#if 0
static krb5_error_code static krb5_error_code
LDAP_fetch(krb5_context context, HDB * db, krb5_const_principal principal, LDAP_fetch(krb5_context context, HDB * db, krb5_const_principal principal,
unsigned flags, hdb_entry_ex * entry) 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, return LDAP_fetch_kvno(context, db, principal,
flags & (~HDB_F_KVNO_SPECIFIED), 0, entry); flags & (~HDB_F_KVNO_SPECIFIED), 0, entry);
} }
#endif
static krb5_error_code static krb5_error_code
LDAP_store(krb5_context context, HDB * db, unsigned flags, LDAP_store(krb5_context context, HDB * db, unsigned flags,

2
lib/hdb/mkey.c
View File

@@ -374,7 +374,7 @@ _hdb_set_master_key_usage(krb5_context context, HDB *db, unsigned int key_usage)
} }
hdb_master_key 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; hdb_master_key ret = NULL;
while(mkey) { while(mkey) {