diff options
author | Lukas Slebodnik <lslebodn@redhat.com> | 2016-03-09 10:16:58 +0100 |
---|---|---|
committer | Martin Basti <mbasti@redhat.com> | 2016-03-09 18:59:29 +0100 |
commit | 0906cc28b8387a62945d2531dd19bef60f731364 (patch) | |
tree | 910c4201b54a7a3396692257e4162abc1a0a90a9 /daemons/ipa-sam | |
parent | dd86f83c96961390f756e35496447d6aeae64df6 (diff) | |
download | freeipa-0906cc28b8387a62945d2531dd19bef60f731364.tar.gz freeipa-0906cc28b8387a62945d2531dd19bef60f731364.tar.xz freeipa-0906cc28b8387a62945d2531dd19bef60f731364.zip |
ipa-sam: Do not redefine LDAP_PAGE_SIZE
The value of LDAP_PAGE_SIZE was changed in samba-4.4
and it caused warning because it's already defined
in samba header files
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
Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
Diffstat (limited to 'daemons/ipa-sam')
-rw-r--r-- | daemons/ipa-sam/ipa_sam.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/daemons/ipa-sam/ipa_sam.c b/daemons/ipa-sam/ipa_sam.c index 9216e6358..4c1fda5f8 100644 --- a/daemons/ipa-sam/ipa_sam.c +++ b/daemons/ipa-sam/ipa_sam.c @@ -111,7 +111,6 @@ 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 #define LDAP_OBJ_SAMBASAMACCOUNT "ipaNTUserAttrs" #define LDAP_OBJ_TRUSTED_DOMAIN "ipaNTTrustedDomain" #define LDAP_OBJ_ID_OBJECT "ipaIDobject" |