krb5_wrap: add enctype arg to smb_krb5_kt_seek_and_delete_old_entries()

Unused in this commit, the next commit will use it to avoid deleting
keys with the same kvno but a different enctype.

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>

diff --git a/lib/krb5_wrap/krb5_samba.c b/lib/krb5_wrap/krb5_samba.c
index 247b83be2f2429cf79962b05ffed2ddbac33d9b8..ea1f2d18b5c30f36093feffebb28bb18a2ad47cb 100644 (file)
--- a/lib/krb5_wrap/krb5_samba.c
+++ b/lib/krb5_wrap/krb5_samba.c
@@ -1485,6 +1485,7 @@ krb5_error_code smb_krb5_keytab_name(TALLOC_CTX *mem_ctx,
 krb5_error_code smb_krb5_kt_seek_and_delete_old_entries(krb5_context context,
                                                        krb5_keytab keytab,
                                                        krb5_kvno kvno,
+                                                       krb5_enctype enctype,
                                                        const char *princ_s,
                                                        krb5_principal princ,
                                                        bool flush,
@@ -1694,6 +1695,7 @@ krb5_error_code smb_krb5_kt_add_entry(krb5_context context,
        ret = smb_krb5_kt_seek_and_delete_old_entries(context,
                                                      keytab,
                                                      kvno,
+                                                     enctype,
                                                      princ_s,
                                                      princ,
                                                      false,

diff --git a/lib/krb5_wrap/krb5_samba.h b/lib/krb5_wrap/krb5_samba.h
index f198d72ffb2f96f169cfa0530210798e10facdfc..15da9a1408b3180189db0960b1301a3c77247bbb 100644 (file)
--- a/lib/krb5_wrap/krb5_samba.h
+++ b/lib/krb5_wrap/krb5_samba.h
@@ -193,6 +193,7 @@ krb5_error_code smb_krb5_keytab_name(TALLOC_CTX *mem_ctx,
 krb5_error_code smb_krb5_kt_seek_and_delete_old_entries(krb5_context context,
                                                        krb5_keytab keytab,
                                                        krb5_kvno kvno,
+                                                       krb5_enctype enctype,
                                                        const char *princ_s,
                                                        krb5_principal princ,
                                                        bool flush,

diff --git a/source3/libads/kerberos_keytab.c b/source3/libads/kerberos_keytab.c
index 340e55252e822fad36ce67a1aa7112bdbf3fff4f..8a3363c577a2ce813c5919b0f4a27722e919cef9 100644 (file)
--- a/source3/libads/kerberos_keytab.c
+++ b/source3/libads/kerberos_keytab.c
@@ -280,6 +280,7 @@ int ads_keytab_flush(ADS_STRUCT *ads)
        ret = smb_krb5_kt_seek_and_delete_old_entries(context,
                                                      keytab,
                                                      kvno,
+                                                     KRB5_ENCTYPE_NULL,
                                                      NULL,
                                                      NULL,
                                                      true,