upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-01-31 19:09:42 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Resolve conflict between ITS#7492 and ITS#7520

Browse source
This commit is contained in:
Ondřej Kuzník 2019-05-13 11:43:33 +01:00 committed by Ondřej Kuzník
parent 60754d77c8
commit 747679256c
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
servers/slapd/back-ldap/back-ldap.h
View file

@ -291,7 +291,7 @@ typedef struct ldapinfo_t {
unsigned li_flags;
/* 0xFFF00000U are reserved for back-meta */
/* 0xFF000000U are reserved for back-meta */
#define LDAP_BACK_F_NONE (0x00000000U)
#define LDAP_BACK_F_SAVECRED (0x00000001U)
@ -335,7 +335,7 @@ typedef struct ldapinfo_t {
#define LDAP_BACK_F_NOUNDEFFILTER (0x00100000U)
#define LDAP_BACK_F_OMIT_UNKNOWN_SCHEMA (0x00200000U)
#define LDAP_BACK_F_ONERR_STOP (0x00200000U)
#define LDAP_BACK_F_ONERR_STOP (0x00400000U)
#define LDAP_BACK_ISSET_F(ff,f) ( ( (ff) & (f) ) == (f) )
#define LDAP_BACK_ISMASK_F(ff,m,f) ( ( (ff) & (m) ) == (f) )