On Tue, Jan 27, 2015 at 11:24:48AM +0100, Pavel Březina wrote:
On 01/21/2015 05:30 PM, Jakub Hrozek wrote:
>>It looks good otherwise. I got the following compilation error though:
>>
>> CC src/tests/cmocka/ifp_tests-common_mock_resp.o
>>In file included from /home/pbrezina/workspace/sssd/src/tests/common.h:31:0,
>> from
>>/home/pbrezina/workspace/sssd/src/tests/cmocka/common_mock.h:44,
>> from
>>/home/pbrezina/workspace/sssd/src/tests/cmocka/test_resolv_fake.c:35:
>>/home/pbrezina/workspace/sssd/src/providers/ldap/sdap.h:507:33: error:
>>function declaration isn’t a prototype [-Werror=strict-prototypes]
>
>This one was fun to track down. So because in the tests we use both the system
>resolver and indirectly the sdap.h include file is present, the function
>declaration resolved to:
>
>errno_t sdap_parse_deref(TALLOC_CTX *mem_ctx,
> struct sdap_attr_map_info *minfo,
> size_t num_maps,
> LDAPDerefRes *dref,
> struct sdap_deref_attrs ***(*__res_state()));
>
>I think the simplest solution is to rename the _res parameter into something else..
Nice... this is just sad.
ACK to all patches. I'm sending a rebased version in the attachement, it was
just a simple Makefile conflict.
Thank you very much for the rebase. Pushed to master:
* bf54fbed126ec3d459af40ea370ffadacd31c76d
* 4d7fe714fe74ad242497b2bdbeb7b4e0bf40141f
and to sssd-1-12:
* 3149069126599133a8fe0c66734df6deb3907dfb
* 07d69e93a2d2ba68c2fe67d8fb5de18cf69ba797