Resolve conflict between ITS#7492 and ITS#7520

diff --git a/servers/slapd/back-ldap/back-ldap.h b/servers/slapd/back-ldap/back-ldap.h
index f594c7f7deae301552a50ca7a9c6873a44e966dd..7e7d2af9ab436607b95a70bfdcf94ef5bddc914c 100644 (file)
--- a/servers/slapd/back-ldap/back-ldap.h
+++ b/servers/slapd/back-ldap/back-ldap.h
@@ -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) )