remove reference to obsolete flags
authorJohn Kohl <jtkohl@mit.edu>
Thu, 20 Dec 1990 14:46:17 +0000 (14:46 +0000)
committerJohn Kohl <jtkohl@mit.edu>
Thu, 20 Dec 1990 14:46:17 +0000 (14:46 +0000)
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@1580 dc483132-0cff-0310-8789-dd5450dbe970

src/kdc/do_as_req.c
src/kdc/do_tgs_req.c
src/kdc/policy.c

index ec573cf9c2530fc9f5791adca8250e1536e1f936..b804d61278a4b612f7745523c226c2d1170ef567 100644 (file)
@@ -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;
index b429b51d09b54ad7c560bb16399408c6bc5a6126..09045a4833e2cb9a7c6d9b46c6bacf064f2f071e 100644 (file)
@@ -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();
index d9f5f5f0e499d40242c3e08a8fd2b8c2c5d6dcbe..75bd63f5fec67a0b8042d29e4105cd5dc4eda09e 100644 (file)
@@ -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 */