From 3b98428a6e768378a8e1692d7d96028b6d7c406e Mon Sep 17 00:00:00 2001
From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Mon, 10 Nov 2008 23:40:35 +0000
Subject: [PATCH] ITS#5801
---
CHANGES | 3 ++-
contrib/slapd-modules/nssov/nssov.c | 5 ++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/CHANGES b/CHANGES
index 2eb5e2d2e8..38d3eda18b 100644
--- 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 741bc1d69a..9e4d6fead3 100644
--- 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;
}
--
GitLab