From 24807705855103ba29d5e6af2a50ca821efb461b Mon Sep 17 00:00:00 2001
From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Mon, 10 Nov 2008 18:49:19 +0000
Subject: [PATCH] ITS#5747
---
CHANGES | 3 ++-
servers/slapd/overlays/collect.c | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/CHANGES b/CHANGES
index d5387d8b5d..abc80c7933 100644
--- a/CHANGES
+++ b/CHANGES
@@ -11,7 +11,8 @@ OpenLDAP 2.4.13 Engineering
Added slapd-bdb/hdb dbpagesize keyword
Added slapd-bdb/hdb checksum keyword
Fixed slapo-chain/translucent back-config support (ITS#5736)
- Fixed slapd-chain segv with search references (ITS#5742)
+ Fixed slapo-chain segv with search references (ITS#5742)
+ Fixed slapo-collect compile with C89 (ITS#5747)
Added slapo-constraint support for LDAP URI constraints (ITS#5704)
Added slapo-constraint support for constraining rename (ITS#5703)
Added slapo-constraint support for relax control (ITS#5705)
diff --git a/servers/slapd/overlays/collect.c b/servers/slapd/overlays/collect.c
index 4852022f95..f01045a958 100644
--- a/servers/slapd/overlays/collect.c
+++ b/servers/slapd/overlays/collect.c
@@ -46,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;
/*
@@ -176,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 );
--
GitLab