From: Karolin Seeger <kseeger@samba.org>
Date: Wed, 21 Feb 2018 09:15:22 +0000 (+0100)
Subject: Revert "HEIMDAL:kdc: use the correct authtime from addtitional ticket for S4U2Proxy... 
X-Git-Tag: samba-4.6.15~51
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3a54a0497315430501a13f6397f3e2889197158a;p=thirdparty%2Fsamba.git

Revert "HEIMDAL:kdc: use the correct authtime from addtitional ticket for S4U2Proxy tickets"

This reverts commit 9ecdf21e174ba7525b77035664428fbdcbf53690.
---

diff --git a/source4/heimdal/kdc/krb5tgs.c b/source4/heimdal/kdc/krb5tgs.c
index e11ad527821..a91b319c630 100644
--- a/source4/heimdal/kdc/krb5tgs.c
+++ b/source4/heimdal/kdc/krb5tgs.c
@@ -725,7 +725,6 @@ tgs_make_reply(krb5_context context,
 	       KDC_REQ_BODY *b,
 	       krb5_const_principal tgt_name,
 	       const EncTicketPart *tgt,
-	       const EncTicketPart *adtgt,
 	       const krb5_keyblock *replykey,
 	       int rk_is_subkey,
 	       const EncryptionKey *serverkey,
@@ -759,7 +758,7 @@ tgs_make_reply(krb5_context context,
     rep.pvno = 5;
     rep.msg_type = krb_tgs_rep;
 
-    et.authtime = adtgt->authtime;
+    et.authtime = tgt->authtime;
     _kdc_fix_time(&b->till);
     et.endtime = min(tgt->endtime, *b->till);
     ALLOC(et.starttime);
@@ -1481,7 +1480,6 @@ tgs_build_reply(krb5_context context,
     Realm r;
     int nloop = 0;
     EncTicketPart adtkt;
-    EncTicketPart *adtgt = tgt;
     char opt_str[128];
     int signedpath = 0;
 
@@ -2148,7 +2146,7 @@ server_lookup:
 	if (rk_is_subkey == 0) {
 	    auth_data_key = &adtkt.key;
 	}
-	adtgt = &adtkt;
+
 	kdc_log(context, config, 0, "constrained delegation for %s "
 		"from %s (%s) to %s", tpn, cpn, dpn, spn);
     }
@@ -2264,7 +2262,6 @@ server_lookup:
 			 b,
 			 tp,
 			 tgt,
-			 adtgt,
 			 replykey,
 			 rk_is_subkey,
 			 ekey,