From 747679256c3e80864c133caf7d23c1b61b5287f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Kuzn=C3=ADk?= Date: Mon, 13 May 2019 11:43:33 +0100 Subject: [PATCH] Resolve conflict between ITS#7492 and ITS#7520 --- servers/slapd/back-ldap/back-ldap.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/servers/slapd/back-ldap/back-ldap.h b/servers/slapd/back-ldap/back-ldap.h index aa0dc326e8..09f080018d 100644 --- a/servers/slapd/back-ldap/back-ldap.h +++ b/servers/slapd/back-ldap/back-ldap.h @@ -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) )