summaryrefslogtreecommitdiffstats
path: root/source4/heimdal
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2008-08-13 07:22:36 +0200
committerStefan Metzmacher <metze@samba.org>2008-08-14 13:13:52 +0200
commite75f1072b6c3735690d7b20682036b8bc5977dc5 (patch)
tree095789c90e42cf441fb7c151a289d11b2b3893e7 /source4/heimdal
parent69d074af81e57c67ee85314c2b5f7a642844ae88 (diff)
downloadsamba-e75f1072b6c3735690d7b20682036b8bc5977dc5.tar.gz
samba-e75f1072b6c3735690d7b20682036b8bc5977dc5.tar.xz
samba-e75f1072b6c3735690d7b20682036b8bc5977dc5.zip
Revert "krb5: always generate the acceptor subkey as the same enctype as the used service key"
This reverts commit dbb94133e0313cae933d261af0bf1210807a6d11. As we fixed gensec_gssapi to only return a session key when it's have the correct session key, this hack isn't needed anymore. metze (This used to be commit 697cd1896bccaa55ee422f17d9312d787ca699ed)
Diffstat (limited to 'source4/heimdal')
-rw-r--r--source4/heimdal/lib/krb5/rd_req.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/source4/heimdal/lib/krb5/rd_req.c b/source4/heimdal/lib/krb5/rd_req.c
index e80aaa6789b..ddf1f69ae44 100644
--- a/source4/heimdal/lib/krb5/rd_req.c
+++ b/source4/heimdal/lib/krb5/rd_req.c
@@ -463,8 +463,6 @@ krb5_verify_ap_req2(krb5_context context,
ac->keytype = ETYPE_NULL;
-#if 0
-/* it's bad to use a different enctype as the client */
if (etypes.val) {
int i;
@@ -475,7 +473,6 @@ krb5_verify_ap_req2(krb5_context context,
}
}
}
-#endif
/* save key */
ret = krb5_copy_keyblock(context, &t->ticket.key, &ac->keyblock);