diff options
author | Simo Sorce <simo@redhat.com> | 2015-02-03 12:06:24 -0500 |
---|---|---|
committer | Martin Kosek <mkosek@redhat.com> | 2015-02-13 08:54:34 +0100 |
commit | 5247c0c4e2e2e02180e4cbf56aa68df57d1a8cf9 (patch) | |
tree | 397ba4c6bae45548e74801387a0ef299cf94a15f /daemons | |
parent | 9cbbcadd0471a5e4b695c57f49e5a02400848053 (diff) | |
download | freeipa-5247c0c4e2e2e02180e4cbf56aa68df57d1a8cf9.tar.gz freeipa-5247c0c4e2e2e02180e4cbf56aa68df57d1a8cf9.tar.xz freeipa-5247c0c4e2e2e02180e4cbf56aa68df57d1a8cf9.zip |
Handle DAL ABI change in MIT 1.13
In this new MIT version the DAL interface changes slightly but
KRB5_KDB_DAL_MAJOR_VERSION was not changed.
Luckily KRB5_KDB_API_VERSION did change and that's enough to know
what to compile in.
Resolves: https://fedorahosted.org/freeipa/ticket/4861
Signed-off-by: Simo Sorce <simo@redhat.com>
Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
Diffstat (limited to 'daemons')
-rw-r--r-- | daemons/ipa-kdb/ipa_kdb.h | 7 | ||||
-rw-r--r-- | daemons/ipa-kdb/ipa_kdb_principals.c | 7 |
2 files changed, 14 insertions, 0 deletions
diff --git a/daemons/ipa-kdb/ipa_kdb.h b/daemons/ipa-kdb/ipa_kdb.h index b92107bab..ba9968bce 100644 --- a/daemons/ipa-kdb/ipa_kdb.h +++ b/daemons/ipa-kdb/ipa_kdb.h @@ -182,10 +182,17 @@ krb5_error_code ipadb_put_principal(krb5_context kcontext, char **db_args); krb5_error_code ipadb_delete_principal(krb5_context kcontext, krb5_const_principal search_for); +#if KRB5_KDB_API_VERSION < 8 krb5_error_code ipadb_iterate(krb5_context kcontext, char *match_entry, int (*func)(krb5_pointer, krb5_db_entry *), krb5_pointer func_arg); +#else +krb5_error_code ipadb_iterate(krb5_context kcontext, + char *match_entry, + int (*func)(krb5_pointer, krb5_db_entry *), + krb5_pointer func_arg, krb5_flags iterflags); +#endif /* POLICY FUNCTIONS */ diff --git a/daemons/ipa-kdb/ipa_kdb_principals.c b/daemons/ipa-kdb/ipa_kdb_principals.c index 828ba760c..d0fd3e291 100644 --- a/daemons/ipa-kdb/ipa_kdb_principals.c +++ b/daemons/ipa-kdb/ipa_kdb_principals.c @@ -2112,10 +2112,17 @@ done: return kerr; } +#if KRB5_KDB_API_VERSION < 8 krb5_error_code ipadb_iterate(krb5_context kcontext, char *match_entry, int (*func)(krb5_pointer, krb5_db_entry *), krb5_pointer func_arg) +#else +krb5_error_code ipadb_iterate(krb5_context kcontext, + char *match_entry, + int (*func)(krb5_pointer, krb5_db_entry *), + krb5_pointer func_arg, krb5_flags iterflags) +#endif { struct ipadb_context *ipactx; krb5_error_code kerr; |