[Freeipa-devel] [PATCH] Fix for 4861

[Martin Kosek]

On 02/04/2015 10:15 AM, Alexander Bokovoy wrote:
> On Tue, 03 Feb 2015, Simo Sorce wrote:
>> See subject :-)
>>
>> -- 
>> Simo Sorce * Red Hat, Inc. * New York
> 
>> From 245b307a99722bd4ca61e799f1a2708b6689f773 Mon Sep 17 00:00:00 2001
>> From: Simo Sorce <simo at redhat.com>
>> Date: Tue, 3 Feb 2015 12:06:24 -0500
>> Subject: [PATCH] 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 at redhat.com>
>> ---
>> daemons/ipa-kdb/ipa_kdb.h            | 7 +++++++
>> daemons/ipa-kdb/ipa_kdb_principals.c | 7 +++++++
>> 2 files changed, 14 insertions(+)
>>
>> diff --git a/daemons/ipa-kdb/ipa_kdb.h b/daemons/ipa-kdb/ipa_kdb.h
>> index
>> b92107bab5a259601160a402c54fa8ed440925b3..ba9968bce7cff87f9f4a7fcd056ff7a906ce9e82
>> 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
>> e158c236eab5c7c5a7c12664dbde5d51cc55406d..600c4ee41c74a2fc154a5372ad3e3b4e8b94a635
>> 100644
>> --- a/daemons/ipa-kdb/ipa_kdb_principals.c
>> +++ b/daemons/ipa-kdb/ipa_kdb_principals.c
>> @@ -2087,10 +2087,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;
> ACK.
> I think we need this patch in both master and ipa-4-1. There is no functional
> change
> and I'd like to keep a code in plugins synchronized across branches if
> possible to avoid maintenance hurdles in future.
> 

I agree with ipa-4-1. We will build FreeIPA 4.1 for F22+ anyway, until we have
FreeIPA 4.2 ready.

Pushed to:
master: 5247c0c4e2e2e02180e4cbf56aa68df57d1a8cf9
ipa-4-1: 6162426999e75fdf907faf13f5a158d72ed91be5

Martin