From 282e5784a03add45dc662b27da6f2d29e1ab80cb Mon Sep 17 00:00:00 2001 From: Jo Sutton Date: Mon, 15 Apr 2024 14:45:51 +1200 Subject: [PATCH] s4:kdc: Add helper variable indicating whether we think we are performing a keytab export Signed-off-by: Jo Sutton Reviewed-by: Andrew Bartlett --- source4/kdc/db-glue.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source4/kdc/db-glue.c b/source4/kdc/db-glue.c index b08f196d225..1c00527d481 100644 --- a/source4/kdc/db-glue.c +++ b/source4/kdc/db-glue.c @@ -612,6 +612,7 @@ krb5_error_code samba_kdc_message2entry_keys(krb5_context context, struct samba_kdc_user_keys older_keys = { .num_pkeys = 0, }; uint32_t available_enctypes = 0; uint32_t supported_enctypes = supported_enctypes_in; + const bool exporting_keytab = flags & SDB_F_ADMIN_DATA; *supported_enctypes_out = 0; @@ -826,7 +827,7 @@ krb5_error_code samba_kdc_message2entry_keys(krb5_context context, if ((flags & SDB_F_GET_CLIENT) && (flags & SDB_F_FOR_AS_REQ)) { include_history = true; - } else if (flags & SDB_F_ADMIN_DATA) { + } else if (exporting_keytab) { include_history = true; } -- 2.34.1