ITS#6075

diff --git a/CHANGES b/CHANGES
index b6bc31a5c3509f551add73737de0d9a759e7d141..141c263b5e4fb2508848f6eec150599bb2a1673c 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -34,6 +34,7 @@ OpenLDAP 2.4.17 Engineering
        Fixed slapd-ldap deadlock with non-responsive TLS URIs (ITS#6167)
        Fixed slapd-relay to return failure on failure (ITS#5328)
        Fixed slapd-sql with BACKSQL_ARBITRARY_KEY defined (ITS#6100)
+       Fixed slapo-collect missing equality match rule (ITS#6075)
        Fixed slapo-dds entry expiration (ITS#6169)
        Fixed slapo-refint refint_repair handling (ITS#6056)
        Added slapo-rwm rwm-drop-unrequested-attrs config option (ITS#6057)

diff --git a/servers/slapd/overlays/collect.c b/servers/slapd/overlays/collect.c
index f98040c5ebce1b7647dd4be125550eab2309bffc..29d94dc7d3aa5980ecf7449f880fffc708f469ff 100644 (file)
--- a/servers/slapd/overlays/collect.c
+++ b/servers/slapd/overlays/collect.c
@@ -72,7 +72,7 @@ insert_ordered( slap_overinst *on, collect_info *ci ) {
                                ci->ci_next = NULL;
                        }
                        found = 1;
-               } else if (find->ci_dn.bv_len <= ci->ci_dn.bv_len) { 
+               } else if (find->ci_dn.bv_len < ci->ci_dn.bv_len) { 
                        /* insert into list here */
                        if (prev == NULL) {
                                /* entry is head of list */
@@ -151,7 +151,11 @@ collect_cf( ConfigArgs *c )
                        collect_info **cip, *ci;
                        int i;
                        cip = (collect_info **)&on->on_bi.bi_private;
-                       for ( i=0; i <= c->valx; i++, cip = &ci->ci_next ) ci = *cip;
+                       ci = *cip;
+                       for ( i=0; i < c->valx; i++ ) {
+                               cip = &ci->ci_next;
+                               ci = *cip;
+                       }
                        *cip = ci->ci_next;
                        ch_free( ci->ci_dn.bv_val );
                        ch_free( ci );
@@ -174,10 +178,6 @@ collect_cf( ConfigArgs *c )
                        arg = strtok(NULL, ",");
                }
 
-               /* allocate config info with room for attribute array */
-               ci = ch_malloc( sizeof( collect_info ) +
-                       sizeof( AttributeDescription * ) * count );
-
                /* validate and normalize dn */
                ber_str2bv( c->argv[1], 0, 0, &bv );
                if ( dnNormalize( 0, NULL, NULL, &bv, &dn, NULL ) ) {
@@ -188,6 +188,10 @@ collect_cf( ConfigArgs *c )
                        return ARG_BAD_CONF;
                }
 
+               /* allocate config info with room for attribute array */
+               ci = ch_malloc( sizeof( collect_info ) +
+                       sizeof( AttributeDescription * ) * count );
+
                /* load attribute description for attribute list */
                arg = c->argv[2];
                for( idx=0; idx<count; idx++) {
@@ -199,6 +203,7 @@ collect_cf( ConfigArgs *c )
                                        c->argv[0], arg);
                                Debug( LDAP_DEBUG_CONFIG|LDAP_DEBUG_NONE,
                                        "%s: %s\n", c->log, c->cr_msg, 0 );
+                               ch_free( ci );
                                return ARG_BAD_CONF;
                        }
                        while(*arg!='\0') {
@@ -230,6 +235,7 @@ static ConfigTable collectcfg[] = {
          ARG_MAGIC, collect_cf,
          "( OLcfgOvAt:19.1 NAME 'olcCollectInfo' "
          "DESC 'DN of entry and attribute to distribute' "
+         "EQUALITY caseIgnoreMatch "
          "SYNTAX OMsDirectoryString )", NULL, NULL },
        { NULL, NULL, 0, 0, 0, ARG_IGNORED }
 };