From: Pierangelo Masarati <ando@openldap.org>
Date: Fri, 7 Dec 2001 15:46:58 +0000 (+0000)
Subject: fixes ITS#1367 for REL_ENG
X-Git-Tag: OPENLDAP_REL_ENG_2_0_19~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d1fb80f738af6f75477bb83ecbd04b800e1802a5;p=thirdparty%2Fopenldap.git

fixes ITS#1367 for REL_ENG
---

diff --git a/servers/slapd/back-ldap/search.c b/servers/slapd/back-ldap/search.c
index ba3f41972a..260f8f7615 100644
--- a/servers/slapd/back-ldap/search.c
+++ b/servers/slapd/back-ldap/search.c
@@ -169,7 +169,12 @@ ldap_send_entry(
 			continue;
 		attr->a_next = 0;
 		attr->a_desc = NULL;
-		slap_str2ad(a, &attr->a_desc, &text);
+		if (slap_str2ad(a, &attr->a_desc, &text) != LDAP_SUCCESS) {
+			if (slap_str2undef_ad(a, &attr->a_desc, &text) != LDAP_SUCCESS) {
+				ch_free(attr);
+				continue;
+			}
+		}		
 		attr->a_vals = ldap_get_values_len(lc->ld, e, a);
 		if (!attr->a_vals)
 			attr->a_vals = &dummy;