From 3825f51beeb96751641b8b4f5adb2123f584f17d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Kuzn=C3=ADk?= <ondra@openldap.org>
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 f594c7f7de..7e7d2af9ab 100644
--- 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) )
--
GitLab