ITS#6240

diff --git a/CHANGES b/CHANGES
index 00b2783dc4b1d235f5c418ffef55fe7129a2c461..2b60d23df8d6cc4e7d0d65c1d018bcd2ffa0120e 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -9,6 +9,7 @@ OpenLDAP 2.4.18 Engineering
        Fixed slapd certificate parsing (ITS#6241)
        Fixed slapd dncachesize behavior to unlimited by default (ITS#6222)
        Fixed slapd incorrectly applying writetimeout when not set (ITS#6220)
+       Fixed slapd with duplicate empty lines for olcDbConfig (ITS#6240)
        Fixed slapd server URL matching (ITS#5942)
        Fixed slapd subordinate needs a suffix (ITS#6216)
        Fixed slapd tools to properly close database (ITS#6214)

diff --git a/servers/slapd/modify.c b/servers/slapd/modify.c
index 2710ffe79969d1491d9aec60b0311fed60495063..e4f4ff4cd14656b218191a7979527f258b659a22 100644 (file)
--- a/servers/slapd/modify.c
+++ b/servers/slapd/modify.c
@@ -690,7 +690,7 @@ slap_sort_vals(
 #define        SWAP(a,b,tmp)   tmp=(a);(a)=(b);(b)=tmp
 #define        COMP(a,b)       match=0; rc = ordered_value_match( &match, \
                                                ad, mr, SLAP_MR_EQUALITY \
-                                                               | SLAP_MR_VALUE_OF_ATTRIBUTE_SYNTAX \
+                                                               | SLAP_MR_VALUE_OF_ASSERTION_SYNTAX \
                                                                | SLAP_MR_ASSERTED_VALUE_NORMALIZED_MATCH \
                                                                | SLAP_MR_ATTRIBUTE_VALUE_NORMALIZED_MATCH, \
                                                                &(a), &(b), text );