ITS#6266

diff --git a/CHANGES b/CHANGES
index 3df0a31d63b26e4e7789895fc9e58505d251d956..840b7bedd13d8300b769083d79c4d972ccd39347 100644 (file)
--- 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 8e90185296e006ce264e23293aecc5dee631fae9..630400384e252ea4f46a33d04ec7b7640f1ae727 100644 (file)
--- 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;