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

merge error

Browse Source
This commit is contained in:
Love Hörnquist Åstrand
2011-10-28 19:34:35 -07:00
parent b4972bd4f0
commit f0fb8b1bef
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kdc/krb5tgs.c
View File

@@ -987,7 +987,7 @@ tgs_make_reply(krb5_context context,
CAST session key. Should the DES3 etype be added to the CAST session key. Should the DES3 etype be added to the
etype list, even if we don't want a session key with etype list, even if we don't want a session key with
DES3? */ DES3? */
ret = _kdc_encode_reply(context, config, NULL, 0 ret = _kdc_encode_reply(context, config, NULL, 0,
&rep, &et, &ek, serverkey->keytype, &rep, &et, &ek, serverkey->keytype,
kvno, kvno,
serverkey, 0, replykey, rk_is_subkey, serverkey, 0, replykey, rk_is_subkey,