From 1d36859dc06501aee3db2b27bf03ef31013e33e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= <lha@kth.se>
Date: Tue, 9 Sep 2003 02:01:02 +0000
Subject: [PATCH] (only_older_enctype_p): check request if the client only
 supports old enctypes, before it used the database

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@12787 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 kdc/kerberos5.c | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/kdc/kerberos5.c b/kdc/kerberos5.c
index 96b582a74..6afb03263 100644
--- a/kdc/kerberos5.c
+++ b/kdc/kerberos5.c
@@ -430,15 +430,18 @@ make_etype_info2_entry(ETYPE_INFO2_ENTRY *ent, Key *key)
  */
 
 static int
-only_older_enctype_p(const hdb_entry *client)
+only_older_enctype_p(const KDC_REQ *req)
 {
     int i;
 
-    for(i = 0; i < client->keys.len; i++) {
-	switch (client->keys.val[i].key.keytype) {
-	case KEYTYPE_DES:
-	case KEYTYPE_DES3:
-	case KEYTYPE_ARCFOUR:
+    for(i = 0; i < req->req_body.etype.len; i++) {
+	switch (req->req_body.etype.val[i]) {
+	case ETYPE_DES_CBC_CRC:
+	case ETYPE_DES_CBC_MD4:
+	case ETYPE_DES_CBC_MD5:
+	case ETYPE_DES3_CBC_SHA1:
+	case ETYPE_ARCFOUR_HMAC_MD5:
+	case ETYPE_ARCFOUR_HMAC_MD5_56:
 	    break;
 	default:
 	    return 0;
@@ -821,7 +824,7 @@ as_rep(KDC_REQ *req,
 	pa->padata_value.data	= NULL;
 
 	/* XXX check ret */
-	if (only_older_enctype_p(client))
+	if (only_older_enctype_p(req))
 	    ret = get_pa_etype_info(&method_data, client, 
 				    b->etype.val, b->etype.len); 
 	/* XXX check ret */