From 3893176ccc1ab6b703647e7a61d7125266e83036 Mon Sep 17 00:00:00 2001
From: John Kohl <jtkohl@mit.edu>
Date: Thu, 20 Dec 1990 14:46:17 +0000
Subject: [PATCH] remove reference to obsolete flags

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@1580 dc483132-0cff-0310-8789-dd5450dbe970
---
 src/kdc/do_as_req.c  |  3 ---
 src/kdc/do_tgs_req.c | 33 +++++----------------------------
 src/kdc/policy.c     |  1 -
 3 files changed, 5 insertions(+), 32 deletions(-)

diff --git a/src/kdc/do_as_req.c b/src/kdc/do_as_req.c
index ec573cf9c..b804d6127 100644
--- a/src/kdc/do_as_req.c
+++ b/src/kdc/do_as_req.c
@@ -182,9 +182,6 @@ krb5_data **response;			/* filled in with a response packet */
     if (isflagset(request->kdc_options, KDC_OPT_ALLOW_POSTDATE))
 	setflag(enc_tkt_reply.flags, TKT_FLG_MAY_POSTDATE);
 
-    if (isflagset(request->kdc_options, KDC_OPT_DUPLICATE_SKEY))
-	setflag(enc_tkt_reply.flags, TKT_FLG_DUPLICATE_SKEY);
-
 
     enc_tkt_reply.session = session_key;
     enc_tkt_reply.client = request->client;
diff --git a/src/kdc/do_tgs_req.c b/src/kdc/do_tgs_req.c
index b429b51d0..09045a483 100644
--- a/src/kdc/do_tgs_req.c
+++ b/src/kdc/do_tgs_req.c
@@ -154,31 +154,11 @@ krb5_data **response;			/* filled in with a response packet */
     }
     useetype = request->etype[i];
 
-    if (isflagset(request->kdc_options, KDC_OPT_REUSE_SKEY)) {
-	/* decrypt second ticket, and examine */
-	if (!request->second_ticket ||
-	    !request->second_ticket[st_idx]) {
-	    cleanup();
-	    return(prepare_error_tgs(request,
-				     header_ticket,
-				     KDC_ERR_BADOPTION, response));
-	}
-	if (!isflagset(request->second_ticket[st_idx]->enc_part2->flags,
-		   TKT_FLG_DUPLICATE_SKEY)) {
-	    cleanup();
-	    return(prepare_error_tgs(request,
-				     header_ticket,
-				     KDC_ERR_BADOPTION, response));
-	}
-	session_key = request->second_ticket[st_idx]->enc_part2->session;
-	st_idx++;
-    } else {
-	if (retval = (*(krb5_csarray[useetype]->system->random_key))(krb5_csarray[useetype]->random_sequence, &session_key)) {
-	    /* random key failed */
-	    tkt_cleanup();
-	    cleanup();
-	    return(retval);
-	}
+    if (retval = (*(krb5_csarray[useetype]->system->random_key))(krb5_csarray[useetype]->random_sequence, &session_key)) {
+	/* random key failed */
+	tkt_cleanup();
+	cleanup();
+	return(retval);
     }
 
 #undef cleanup
@@ -256,9 +236,6 @@ krb5_data **response;			/* filled in with a response packet */
     } else
 	enc_tkt_reply.times.starttime = kdc_time;
 
-    if (isflagset(request->kdc_options, KDC_OPT_DUPLICATE_SKEY) ||
-	isflagset(request->kdc_options, KDC_OPT_REUSE_SKEY))
-	setflag(enc_tkt_reply.flags, TKT_FLG_DUPLICATE_SKEY);
     if (isflagset(request->kdc_options, KDC_OPT_VALIDATE)) {
 	if (header_ticket->enc_part2->times.starttime > kdc_time) {
 	    cleanup();
diff --git a/src/kdc/policy.c b/src/kdc/policy.c
index d9f5f5f0e..75bd63f5f 100644
--- a/src/kdc/policy.c
+++ b/src/kdc/policy.c
@@ -39,7 +39,6 @@ const register krb5_kdc_req *request;
 	isflagset(request->kdc_options, KDC_OPT_PROXY) ||
 	isflagset(request->kdc_options, KDC_OPT_RENEW) ||
 	isflagset(request->kdc_options, KDC_OPT_VALIDATE) ||
-	isflagset(request->kdc_options, KDC_OPT_REUSE_SKEY) ||
 	isflagset(request->kdc_options, KDC_OPT_ENC_TKT_IN_SKEY))
 	return TRUE;			/* against policy */
 
-- 
2.26.2