ITS#5801

diff --git a/CHANGES b/CHANGES
index 2eb5e2d2e8339b96f30bbfa9bc43864f323bff48..38d3eda18b9ba8106f978806c01a1dff14c17b1d 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -59,7 +59,8 @@ OpenLDAP 2.4.13 Engineering
        Added slapo-translucent support for PasswordModify exop (ITS#5656)
        Fixed tools simple bind without SASL (ITS#5753)
        Fixed tools unaligned BerElement (ITS#5770)
-       Fixed contriv nssov crash on empty groups (ITS#5800)
+       Fixed contrib nssov crash on empty groups (ITS#5800)
+       Fixed contrib nssov crash with nssov-map (ITS#5801)
        Added contrib smbk5pwd honor principal expiration (ITS#5766)
        Build Environment
                Added ldapurl command

diff --git a/contrib/slapd-modules/nssov/nssov.c b/contrib/slapd-modules/nssov/nssov.c
index 741bc1d69a772853c93998cee2065b653588eeea..9e4d6fead3e5407810b5e1ccc7290d3d4a366a17 100644 (file)
--- a/contrib/slapd-modules/nssov/nssov.c
+++ b/contrib/slapd-modules/nssov/nssov.c
@@ -476,7 +476,6 @@ nss_cf_gen(ConfigArgs *c)
                case NSS_MAP:
                        rc = 1;
                        for (i=NM_alias;i<NM_NONE;i++) {
-                               int j;
 
                                mi = &ni->ni_maps[i];
                                for (j=0;!BER_BVISNULL(&mi->mi_attrkeys[j]);j++) {
@@ -486,10 +485,10 @@ nss_cf_gen(ConfigArgs *c)
 
                                                map.bv_len = nss_svcs[i].word.bv_len +
                                                        mi->mi_attrkeys[j].bv_len +
-                                                       mi->mi_attrs->an_desc->ad_cname.bv_len + 2;
+                                                       mi->mi_attrs[j].an_desc->ad_cname.bv_len + 2;
                                                map.bv_val = ch_malloc(map.bv_len + 1);
                                                sprintf(map.bv_val, "%s %s %s", nss_svcs[i].word.bv_val,
-                                                       mi->mi_attrkeys[j].bv_val, mi->mi_attrs->an_desc->ad_cname.bv_val );
+                                                       mi->mi_attrkeys[j].bv_val, mi->mi_attrs[j].an_desc->ad_cname.bv_val );
                                                ber_bvarray_add( &c->rvalue_vals, &map );
                                                rc = 0;
                                        }