From baf1930b6aecc987b35cf6c82e44cac6fe2e8c65 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 25 Feb 2022 04:09:47 +0100
Subject: [PATCH] kdc: don't fail salt_fastuser_crypto with
 r->req.req_body.cname == NULL for TGS-REQ

---
 kdc/krb5tgs.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kdc/krb5tgs.c b/kdc/krb5tgs.c
index 79a8091d2..c7473c409 100644
--- a/kdc/krb5tgs.c
+++ b/kdc/krb5tgs.c
@@ -2182,8 +2182,8 @@ out:
 				 r->armor_crypto,
 				 &req->req_body,
 				 r->error_code ? r->error_code : ret,
-				 r->client_princ,
-				 r->server_princ,
+				 r->client_princ ? r->client_princ :(r->ticket != NULL ? r->ticket->client : NULL),
+				 r->server_princ ? r->server_princ :(r->ticket != NULL ? r->ticket->server : NULL),
 				 csec, cusec,
 				 data);
 	free_METHOD_DATA(&error_method);