On (03/02/16 14:30), Lukas Slebodnik wrote: >On (29/01/16 19:59), Alexander Bokovoy wrote: >>On Fri, 29 Jan 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 >>> >>>BTW there is also another issue in IPA-SAM. >>>The value of macro LDAP_PAGE_SIZE has changed >>>and therefore there is a warning. >>> >>>ipa_sam.c:114:0: warning: "LDAP_PAGE_SIZE" redefined >>>#define LDAP_PAGE_SIZE 1024 >>>^ >>>In file included from /usr/include/samba-4.0/smbldap.h:24:0, >>> from ipa_sam.c:31: >>>/usr/include/samba-4.0/smb_ldap.h:81:0: note: this is the location of the >>>previous definition >>>#define LDAP_PAGE_SIZE 1000 >>This is something we should fix. I'll look at it once in Brno. >Here is a related change in samba >https://github.com/samba-team/samba/commit/8c2609f3186d40afb5954737dc174ce190cd368a > Please review attached patch.
LS
>From 770577899357a812475d06d1da74254e6f83205d Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik <lsleb...@redhat.com> Date: Wed, 9 Mar 2016 10:16:58 +0100 Subject: [PATCH] ipa-sam: Change value of LDAP_PAGE_SIZE The value of LDAP_PAGE_SIZE was changed in samba-4.4 and samba commit message says: "This matches Windows' Active Directory maximum page size." https://github.com/samba-team/samba/commit/8c2609f3186d40afb5954737dc174ce190cd368a ipa_sam.c:114:0: warning: "LDAP_PAGE_SIZE" redefined #define LDAP_PAGE_SIZE 1024 In file included from /usr/include/samba-4.0/smbldap.h:24:0, from ipa_sam.c:31: /usr/include/samba-4.0/smb_ldap.h:81:0: note: this is the location of the previous definition #define LDAP_PAGE_SIZE 1000 --- daemons/ipa-sam/ipa_sam.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/daemons/ipa-sam/ipa_sam.c b/daemons/ipa-sam/ipa_sam.c index 9216e63587995ef719015e34f96f48262eaf171f..dba7ba2c803ae384bedaed9ae874a6a01232abfb 100644 --- a/daemons/ipa-sam/ipa_sam.c +++ b/daemons/ipa-sam/ipa_sam.c @@ -111,7 +111,8 @@ char *escape_ldap_string(TALLOC_CTX *mem_ctx, const char *s); /* available in li bool secrets_store(const char *key, const void *data, size_t size); /* available in libpdb.so */ void idmap_cache_set_sid2unixid(const struct dom_sid *sid, struct unixid *unix_id); /* available in libsmbconf.so */ -#define LDAP_PAGE_SIZE 1024 +#undef LDAP_PAGE_SIZE +#define LDAP_PAGE_SIZE 1000 #define LDAP_OBJ_SAMBASAMACCOUNT "ipaNTUserAttrs" #define LDAP_OBJ_TRUSTED_DOMAIN "ipaNTTrustedDomain" #define LDAP_OBJ_ID_OBJECT "ipaIDobject" -- 2.7.2
-- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code