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

When using sambaNTPassword, avoid adding more then one enctype 23 to

Browse Source 
krb5EncryptionType.


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@21500 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2007-07-11 15:20:18 +00:00
parent 0f1c7ecf51
commit ca152336fa
1 changed files with 30 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -997,6 +997,7 @@ LDAP_message2entry(krb5_context context, HDB * db, LDAPMessage * msg,
if (ret == 0 && have_arcfour == 0) { if (ret == 0 && have_arcfour == 0) {
unsigned *etypes; unsigned *etypes;
Key *keys; Key *keys;
int i;
keys = realloc(ent->entry.keys.val, keys = realloc(ent->entry.keys.val,
(ent->entry.keys.len + 1) * sizeof(ent->entry.keys.val[0])); (ent->entry.keys.len + 1) * sizeof(ent->entry.keys.val[0]));
@@ -1031,17 +1032,25 @@ LDAP_message2entry(krb5_context context, HDB * db, LDAPMessage * msg,
ent->entry.etypes->len = 0; ent->entry.etypes->len = 0;
} }
for (i = 0; i < ent->entry.etypes->len; i++)
if (ent->entry.etypes->val[i] == ETYPE_ARCFOUR_HMAC_MD5)
break;
/* If there is no ARCFOUR enctype, add one */
if (i == ent->entry.etypes->len) {
etypes = realloc(ent->entry.etypes->val, etypes = realloc(ent->entry.etypes->val,
(ent->entry.etypes->len + 1) * sizeof(ent->entry.etypes->val[0])); (ent->entry.etypes->len + 1) *
sizeof(ent->entry.etypes->val[0]));
if (etypes == NULL) { if (etypes == NULL) {
krb5_set_error_string(context, "malloc: out of memory"); krb5_set_error_string(context, "malloc: out of memory");
ret = ENOMEM; ret = ENOMEM;
goto out; goto out;
} }
ent->entry.etypes->val = etypes; ent->entry.etypes->val = etypes;
ent->entry.etypes->val[ent->entry.etypes->len] = ETYPE_ARCFOUR_HMAC_MD5; ent->entry.etypes->val[ent->entry.etypes->len] =
ETYPE_ARCFOUR_HMAC_MD5;
ent->entry.etypes->len++; ent->entry.etypes->len++;
} }
}
ret = LDAP_get_generalized_time_value(db, msg, "createTimestamp", ret = LDAP_get_generalized_time_value(db, msg, "createTimestamp",
&ent->entry.created_by.time); &ent->entry.created_by.time);