From: Kurt Zeilenga <kurt@openldap.org>
Date: Mon, 16 Jan 2006 22:03:03 +0000 (+0000)
Subject: ITS#4241 fix from HEAD
X-Git-Tag: OPENLDAP_REL_ENG_2_3_18~8
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=caeee0736e4010464ae8725c69ae1c43d2e903f6;p=openldap

ITS#4241 fix from HEAD
---

diff --git a/servers/slapd/bconfig.c b/servers/slapd/bconfig.c
index da0637d062..354b0064e3 100644
--- a/servers/slapd/bconfig.c
+++ b/servers/slapd/bconfig.c
@@ -4100,7 +4100,9 @@ config_build_attrs( Entry *e, AttributeType **at, AttributeDescription *ad,
 		for (i=0;ct[i].name;i++) {
 			if (ct[i].ad == (*at)->sat_ad) {
 				rc = config_get_vals(&ct[i], c);
-				if (rc == LDAP_SUCCESS) {
+				/* NOTE: tolerate that config_get_vals()
+				 * returns success with no values */
+				if (rc == LDAP_SUCCESS && c->rvalue_vals != NULL ) {
 					if ( c->rvalue_nvals )
 						attr_merge(e, ct[i].ad, c->rvalue_vals,
 							c->rvalue_nvals);