fix escaped semicolon bug in back-bdb

diff --git a/servers/slapd/back-bdb/cache.c b/servers/slapd/back-bdb/cache.c
index d6dd3661657ccd2801d6ad2af4d71d8c7df8b391..aef5127b5ee49b73757d8bf05149a62435e3b891 100644 (file)
--- a/servers/slapd/back-bdb/cache.c
+++ b/servers/slapd/back-bdb/cache.c
@@ -336,9 +336,9 @@ bdb_cache_find_ndn(
 
                /* Advance to next lower RDN */
                for (ptr = ei.bei_nrdn.bv_val - 2; ptr > ndn->bv_val
-                       && !DN_SEPARATOR(*ptr); ptr--) /* empty */;
+                       && !NDN_SEPARATOR(*ptr); ptr--) /* empty */;
                if ( ptr >= ndn->bv_val ) {
-                       if (DN_SEPARATOR(*ptr)) ptr++;
+                       if (NDN_SEPARATOR(*ptr)) ptr++;
                        ei.bei_nrdn.bv_len = ei.bei_nrdn.bv_val - ptr - 1;
                        ei.bei_nrdn.bv_val = ptr;
                }

diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index 3ea9dc2462ad6192888300e833f2e64c2d21b820..d6408f3fa9b5a9827bb841076de17370216278b1 100644 (file)
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -133,7 +133,8 @@ LDAP_BEGIN_DECL
        || (c) == '(' || (c) == ')' || !ASCII_PRINTABLE(c) )
 
 #define DN_ESCAPE(c)   ((c) == SLAP_ESCAPE_CHAR)
-#define DN_SEPARATOR(c)        ((c) == ',' || (c) == ';')
+#define NDN_SEPARATOR(c)       ((c) == ',')
+#define DN_SEPARATOR(c)        (NDN_SEPARATOR(c) || (c) == ';')
 #define RDN_ATTRTYPEANDVALUE_SEPARATOR(c) ((c) == '+') /* RFC 2253 */
 #define RDN_SEPARATOR(c) (DN_SEPARATOR(c) || RDN_ATTRTYPEANDVALUE_SEPARATOR(c))
 #define RDN_NEEDSESCAPE(c)     ((c) == '\\' || (c) == '"')