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

51
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,16 +1032,24 @@ LDAP_message2entry(krb5_context context, HDB * db, LDAPMessage * msg,
ent->entry.etypes->len = 0; ent->entry.etypes->len = 0;
} }
etypes = realloc(ent->entry.etypes->val, for (i = 0; i < ent->entry.etypes->len; i++)
(ent->entry.etypes->len + 1) * sizeof(ent->entry.etypes->val[0])); if (ent->entry.etypes->val[i] == ETYPE_ARCFOUR_HMAC_MD5)
if (etypes == NULL) { break;
krb5_set_error_string(context, "malloc: out of memory"); /* If there is no ARCFOUR enctype, add one */
ret = ENOMEM; if (i == ent->entry.etypes->len) {
goto out; etypes = realloc(ent->entry.etypes->val,
(ent->entry.etypes->len + 1) *
sizeof(ent->entry.etypes->val[0]));
if (etypes == NULL) {
krb5_set_error_string(context, "malloc: out of memory");
ret = ENOMEM;
goto out;
}
ent->entry.etypes->val = etypes;
ent->entry.etypes->val[ent->entry.etypes->len] =
ETYPE_ARCFOUR_HMAC_MD5;
ent->entry.etypes->len++;
} }
ent->entry.etypes->val = etypes;
ent->entry.etypes->val[ent->entry.etypes->len] = ETYPE_ARCFOUR_HMAC_MD5;
ent->entry.etypes->len++;
} }
ret = LDAP_get_generalized_time_value(db, msg, "createTimestamp", ret = LDAP_get_generalized_time_value(db, msg, "createTimestamp",
@@ -1204,17 +1213,17 @@ LDAP_message2entry(krb5_context context, HDB * db, LDAPMessage * msg,
if (ret == 0) { if (ret == 0) {
/* parse the [UXW...] string: /* parse the [UXW...] string:
'N' No password 'N' No password
'D' Disabled 'D' Disabled
'H' Homedir required 'H' Homedir required
'T' Temp account. 'T' Temp account.
'U' User account (normal) 'U' User account (normal)
'M' MNS logon user account - what is this ? 'M' MNS logon user account - what is this ?
'W' Workstation account 'W' Workstation account
'S' Server account 'S' Server account
'L' Locked account 'L' Locked account
'X' No Xpiry on password 'X' No Xpiry on password
'I' Interdomain trust account 'I' Interdomain trust account
*/ */
@@ -1281,7 +1290,7 @@ LDAP_message2entry(krb5_context context, HDB * db, LDAPMessage * msg,
ret = 0; ret = 0;
out: out:
if (unparsed_name) if (unparsed_name)
free(unparsed_name); free(unparsed_name);