[Freeipa-devel] [PATCH] IPA-SAM: Fix build with samba 4.4

[Petr Vobornik]

On 02/02/2016 05:54 PM, Alexander Bokovoy wrote:
> On Tue, 02 Feb 2016, Lukas Slebodnik wrote:
>> On (29/01/16 12:12), Lukas Slebodnik wrote:
>>> ehlo,
>>>
>>> attached patch shoudl fix build on fedora-24.
>>> It blocks static analysis scan.
>>>
>>> Even though it unblock build on fedora-24
>>> the solution is not ideal. It's possible that some changes
>>> need to be done in samba side as well.
>>> (missing prototypes for trim_string, smb_xstrdup
>>>
>>> LS
>>
>>>> From f9057ca98557094a4db84ac072ee9efd02a4ff79 Mon Sep 17 00:00:00 2001
>>> From: Lukas Slebodnik <lslebodn at redhat.com>
>>> Date: Fri, 29 Jan 2016 10:40:18 +0100
>>> Subject: [PATCH 1/3] IPA-SAM: Fix build with samba 4.4
>>>
>>> samba_util.h is not shipped with samba-4.4
>>> and it was indirectly included by "ndr.h"
>>>
>>> Some functions have prototypes in different header file
>>> "util/talloc_stack.h" and other does not have declarations
>>> in other header file. But they are still part of libsamba-util.so
>>>
>>> sh$ objdump -T /usr/lib64/libsamba-util.so.0.0.1 | grep -E
>>> "trim_s|xstrdup"
>>> 0000000000022200 g    DF .text  000000000000001f  SAMBA_UTIL_0.0.1
>>> smb_xstrdup
>>> 00000000000223b0 g    DF .text  000000000000019d  SAMBA_UTIL_0.0.1
>>> trim_string
>>>
>>> ipa_sam.c: In function 'ldapsam_uid_to_sid':
>>> ipa_sam.c:836:24: warning: implicit declaration of function
>>> 'talloc_stackframe'
>>>                  [-Wimplicit-function-declaration]
>>>  TALLOC_CTX *tmp_ctx = talloc_stackframe();
>>>                        ^
>>> ipa_sam.c: In function 'pdb_init_ipasam':
>>> ipa_sam.c:4493:2: warning: implicit declaration of function
>>> 'trim_string'
>>>                  [-Wimplicit-function-declaration]
>>>  trim_string( uri, "\"", "\"" );
>>>  ^
>>> ipa_sam.c:4580:26: warning: implicit declaration of function
>>> 'smb_xstrdup'
>>>                   [-Wimplicit-function-declaration]
>>>  ldap_state->domain_dn = smb_xstrdup(dn);
>>>                          ^
>>> ---
>>> daemons/ipa-sam/ipa_sam.c | 6 ++++++
>>> 1 file changed, 6 insertions(+)
>>>
>>> diff --git a/daemons/ipa-sam/ipa_sam.c b/daemons/ipa-sam/ipa_sam.c
>>> index
>>> 7274d600b532f1066661e8a614a47eea7632ed70..871775b0a19e9c273652ff7a0b497d86bb866aa6
>>> 100644
>>> --- a/daemons/ipa-sam/ipa_sam.c
>>> +++ b/daemons/ipa-sam/ipa_sam.c
>>> @@ -19,6 +19,12 @@
>>> #include <util/data_blob.h>
>>> #include <util/time.h>
>>> #include <util/debug.h>
>>> +#include <util/talloc_stack.h>
>>> +
>>> +#ifndef _SAMBA_UTIL_H_
>>> +bool trim_string(char *s, const char *front, const char *back);
>>> +char *smb_xstrdup(const char *s);
>>> +#endif
>> Bump,
>> it would be good to unblock static analysis scans.
> Yes, ACK.

Pushed to:
master: 017b343e13bbfdd0d9951417be8dac4614cb1416
ipa-4-3: 69cc457504306ec1f90d844efa1e4b422564f06d


-- 
Petr Vobornik