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

Don't encrypt twice. Complain on non-convertable principals.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@3499 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
1997-09-13 21:04:15 +00:00
parent 2b54f7ff8f
commit af5e363ebf
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
kdc/hprop.c
View File

@@ -164,8 +164,6 @@ v4_prop(void *arg, Principal *p)
memcpy(key + 4, &p->key_high, 4);
kdb_encrypt_key((des_cblock*)key, (des_cblock*)key, &mkey4, msched4, 0);
}
if(encrypt)
hdb_seal_keys(&ent, msched5);
ALLOC(ent.max_life);
*ent.max_life = krb_life_to_time(0, p->max_life);
@@ -181,10 +179,21 @@ v4_prop(void *arg, Principal *p)
"kadmin",
"hprop",
NULL);
if(ret){
krb5_warn(pd->context, ret, "krb5_make_principal");
ret = 0;
goto out;
}
ent.created_by.time = time(NULL);
ALLOC(ent.modified_by);
krb5_425_conv_principal(pd->context, p->mod_name, p->mod_instance, realm,
&ent.modified_by->principal);
ret = krb5_425_conv_principal(pd->context, p->mod_name, p->mod_instance,
realm, &ent.modified_by->principal);
if(ret){
krb5_warn(pd->context, ret, "%s.%s@%s", p->name, p->instance, realm);
ent.modified_by->principal = NULL;
ret = 0;
goto out;
}
ent.modified_by->time = p->mod_date;
ent.flags.forwardable = 1;
@@ -195,6 +204,7 @@ v4_prop(void *arg, Principal *p)
ent.flags.server = 1;
ret = v5_prop(pd->context, NULL, &ent, pd);
out:
hdb_free_entry(pd->context, &ent);
return ret;
}