Fix corrupted CSN issue

[openldap] / servers / slapd / overlays / collect.c

diff --git a/servers/slapd/overlays/collect.c b/servers/slapd/overlays/collect.c
index 00834d3c06b546c102f07a832405987c09e9d6a6..f98040c5ebce1b7647dd4be125550eab2309bffc 100644 (file)
--- a/servers/slapd/overlays/collect.c
+++ b/servers/slapd/overlays/collect.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2003-2008 The OpenLDAP Foundation.
+ * Copyright 2003-2009 The OpenLDAP Foundation.
  * Portions Copyright 2003 Howard Chu.
  * All rights reserved.
  *
@@ -31,6 +31,8 @@
 #include "slap.h"
 #include "config.h"
 
+#include "lutil.h"
+
 /* This is a cheap hack to implement a collective attribute.
  *
  * This demonstration overlay looks for a specified attribute in an
@@ -44,7 +46,7 @@ typedef struct collect_info {
        struct collect_info *ci_next;
        struct berval ci_dn;
        int ci_ad_num;
-       AttributeDescription *ci_ad[];
+       AttributeDescription *ci_ad[1];
 } collect_info;
 
 /*
@@ -174,7 +176,7 @@ collect_cf( ConfigArgs *c )
 
                /* allocate config info with room for attribute array */
                ci = ch_malloc( sizeof( collect_info ) +
-                       ( sizeof (AttributeDescription *) * (count + 1)));
+                       sizeof( AttributeDescription * ) * count );
 
                /* validate and normalize dn */
                ber_str2bv( c->argv[1], 0, 0, &bv );
@@ -266,7 +268,7 @@ collect_modify( Operation *op, SlapReply *rs)
        collect_info *ci = on->on_bi.bi_private;
        Modifications *ml;
        char errMsg[100];
-       int rc, idx;
+       int idx;
 
        for ( ml = op->orm_modlist; ml != NULL; ml = ml->sml_next) {
                for (; ci; ci=ci->ci_next ) {