s4:kdc: Add helper variable indicating whether we think we are performing a keytab...

Signed-off-by: Jo Sutton <josutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/source4/kdc/db-glue.c b/source4/kdc/db-glue.c
index b08f196d2257686b419954d10325bdca16b83d17..1c00527d4818bed41d73720b147bd49cfef8223f 100644 (file)
--- 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;
                }