Commit 3825f51b authored by Ondřej Kuzník's avatar Ondřej Kuzník Committed by Quanah Gibson-Mount
Browse files

Resolve conflict between ITS#7492 and ITS#7520

parent f16d6a15
......@@ -288,7 +288,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)
......@@ -332,7 +332,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) )
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment