mit-kdb: Add support for KDB version 8

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Sumit Bose <sbose@redhat.com>
Reviewed-by: Guenther Deschner <gd@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/source4/kdc/mit-kdb/kdb_samba.h b/source4/kdc/mit-kdb/kdb_samba.h
index b29cff97da780984f1dba1edd63c36ac366477d8..0258b2d313f947c0f6844fa95228ceb788703c4d 100644 (file)
--- a/source4/kdc/mit-kdb/kdb_samba.h
+++ b/source4/kdc/mit-kdb/kdb_samba.h
@@ -84,10 +84,18 @@ krb5_error_code kdb_samba_db_put_principal(krb5_context context,
 krb5_error_code kdb_samba_db_delete_principal(krb5_context context,
                                              krb5_const_principal princ);
 
+#if KRB5_KDB_API_VERSION == 8
+krb5_error_code kdb_samba_db_iterate(krb5_context context,
+                                    char *match_entry,
+                                    int (*func)(krb5_pointer, krb5_db_entry *),
+                                    krb5_pointer func_arg,
+                                    krb5_flags iterflags);
+#else
 krb5_error_code kdb_samba_db_iterate(krb5_context context,
                                     char *match_entry,
                                     int (*func)(krb5_pointer, krb5_db_entry *),
                                     krb5_pointer func_arg);
+#endif
 
 /* from kdb_samba_masterkey.c */
 

diff --git a/source4/kdc/mit-kdb/kdb_samba_principals.c b/source4/kdc/mit-kdb/kdb_samba_principals.c
index 28908bc3069afc51cd89bda4e0b1951a122e8da2..dc24e7e3cbe8d2474e32c130d6c8a140cadeb918 100644 (file)
--- a/source4/kdc/mit-kdb/kdb_samba_principals.c
+++ b/source4/kdc/mit-kdb/kdb_samba_principals.c
@@ -325,10 +325,18 @@ krb5_error_code kdb_samba_db_delete_principal(krb5_context context,
        return KRB5_KDB_DB_INUSE;
 }
 
+#if KRB5_KDB_API_VERSION == 8
+krb5_error_code kdb_samba_db_iterate(krb5_context context,
+                                    char *match_entry,
+                                    int (*func)(krb5_pointer, krb5_db_entry *),
+                                    krb5_pointer func_arg,
+                                    krb5_flags iterflags)
+#else
 krb5_error_code kdb_samba_db_iterate(krb5_context context,
                                     char *match_entry,
                                     int (*func)(krb5_pointer, krb5_db_entry *),
                                     krb5_pointer func_arg)
+#endif
 {
        struct mit_samba_context *mit_ctx;
        krb5_db_entry *kentry = NULL;