mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-21 03:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

tolerate that config_get_vals() returns success with no values (ITS#4341)

Browse Source
This commit is contained in:
Pierangelo Masarati 2006-01-14 10:21:47 +00:00
parent f3dba23fbb
commit e720c15c4d
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
servers/slapd/bconfig.c
View File

@ -4211,7 +4211,9 @@ config_build_attrs( Entry *e, AttributeType **at, AttributeDescription *ad,
for (i=0;ct[i].name;i++) { for (i=0;ct[i].name;i++) {
if (ct[i].ad == (*at)->sat_ad) { if (ct[i].ad == (*at)->sat_ad) {
rc = config_get_vals(&ct[i], c); 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 ) if ( c->rvalue_nvals )
attr_merge(e, ct[i].ad, c->rvalue_vals, attr_merge(e, ct[i].ad, c->rvalue_vals,
c->rvalue_nvals); c->rvalue_nvals);