From 7cfb7111ab292b2e7b61e5504e4ff001b55c66d6 Mon Sep 17 00:00:00 2001
From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Wed, 26 Aug 2009 01:13:41 +0000
Subject: [PATCH] ITS#6266
---
CHANGES | 1 +
servers/slapd/overlays/dynlist.c | 8 ++------
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/CHANGES b/CHANGES
index 3df0a31d63..840b7bedd1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -25,6 +25,7 @@ OpenLDAP 2.4.18 Engineering
Fixed slapd-relay response/cleanup callback mismatch (ITS#6154)
Fixed slapd-sql with baseObject query (ITS#6172)
Fixed slapd-sql with empty attribute (ITS#6163)
+ Fixed slapo-dynlist uninitialized var (ITS#6266)
Fixed slapo-pcache multiple enhancements (ITS#6152,ITS#5178)
Fixed slapo-ppolicy updating operational attributes (ITS#6265)
Fixed slapo-translucent attribute return (ITS#6254)
diff --git a/servers/slapd/overlays/dynlist.c b/servers/slapd/overlays/dynlist.c
index 8e90185296..630400384e 100644
--- a/servers/slapd/overlays/dynlist.c
+++ b/servers/slapd/overlays/dynlist.c
@@ -957,7 +957,7 @@ dynlist_db_config(
ObjectClass *oc;
AttributeDescription *ad = NULL,
*member_ad = NULL;
- dynlist_map_t *dlm = NULL;
+ dynlist_map_t *dlm = NULL, *dlml = NULL;
const char *text;
if ( argc < 3 ) {
@@ -997,7 +997,6 @@ dynlist_db_config(
AttributeDescription *member_ad = NULL;
AttributeDescription *mapped_ad = NULL;
dynlist_map_t *dlmp;
- dynlist_map_t *dlml;
/*
@@ -1032,7 +1031,6 @@ dynlist_db_config(
dlmp = (dynlist_map_t *)ch_calloc( 1, sizeof( dynlist_map_t ) );
if ( dlm == NULL ) {
dlm = dlmp;
- dlml = NULL;
}
dlmp->dlm_member_ad = member_ad;
dlmp->dlm_mapped_ad = mapped_ad;
@@ -1406,7 +1404,7 @@ dl_cfgen( ConfigArgs *c )
struct berval nbase = BER_BVNULL;
Filter *filter = NULL;
struct berval uri = BER_BVNULL;
- dynlist_map_t *dlm = NULL;
+ dynlist_map_t *dlm = NULL, *dlml = NULL;
const char *text;
oc = oc_find( c->argv[ 1 ] );
@@ -1534,7 +1532,6 @@ done_uri:;
AttributeDescription *member_ad = NULL;
AttributeDescription *mapped_ad = NULL;
dynlist_map_t *dlmp;
- dynlist_map_t *dlml;
/*
@@ -1572,7 +1569,6 @@ done_uri:;
dlmp = (dynlist_map_t *)ch_calloc( 1, sizeof( dynlist_map_t ) );
if ( dlm == NULL ) {
dlm = dlmp;
- dlml = NULL;
}
dlmp->dlm_member_ad = member_ad;
dlmp->dlm_mapped_ad = mapped_ad;
--
GitLab