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

(make_etype_info_entry): Dont send salttype at all, use KRB5-PADATA-AFS3-SALT

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@16002 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2005-09-01 11:17:41 +00:00
parent 37bd48c497
commit 74c8063ed4
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
kdc/kerberos5.c
View File

@@ -326,8 +326,9 @@ make_etype_info_entry(krb5_context context, ETYPE_INFO_ENTRY *ent, Key *key)
{ {
ent->etype = key->key.keytype; ent->etype = key->key.keytype;
if(key->salt){ if(key->salt){
ALLOC(ent->salttype);
#if 0 #if 0
ALLOC(ent->salttype);
if(key->salt->type == hdb_pw_salt) if(key->salt->type == hdb_pw_salt)
*ent->salttype = 0; /* or 1? or NULL? */ *ent->salttype = 0; /* or 1? or NULL? */
else if(key->salt->type == hdb_afs3_salt) else if(key->salt->type == hdb_afs3_salt)
@@ -342,8 +343,17 @@ make_etype_info_entry(krb5_context context, ETYPE_INFO_ENTRY *ent, Key *key)
*know* what cell you are using (e.g by assuming *know* what cell you are using (e.g by assuming
that the cell is the same as the realm in lower that the cell is the same as the realm in lower
case) */ case) */
#else #elif 0
ALLOC(ent->salttype);
*ent->salttype = key->salt->type; *ent->salttype = key->salt->type;
#else
/*
* We shouldn't sent salttype since its incompatible with the
* specification and its break windows clients. The afs
* salting problem is solved by using KRB5-PADATA-AFS3-SALT
* implemented in Heimdal 0.7 and later.
*/
ent->salttype = NULL;
#endif #endif
krb5_copy_data(context, &key->salt->salt, krb5_copy_data(context, &key->salt->salt,
&ent->salt); &ent->salt);