From: Kurt Zeilenga <kurt@openldap.org>
Date: Mon, 25 Oct 1999 00:00:23 +0000 (+0000)
Subject: All text messages to be returned with LDAPv2 search results when
X-Git-Tag: UCDATA_2_4~325
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=92238e52aea15b747a3acee6aed419c20c504b03;p=openldap

All text messages to be returned with LDAPv2 search results when
no referrals need to be returned.
---

diff --git a/servers/slapd/result.c b/servers/slapd/result.c
index 3f28d4b654..31b130aef5 100644
--- a/servers/slapd/result.c
+++ b/servers/slapd/result.c
@@ -450,9 +450,10 @@ send_search_result(
 		}
 
 		tmp = v2ref( refs );
-		text = tmp;
 		refs = NULL;
 
+		if( tmp != NULL ) text = tmp;
+
 	} else {
 		/* don't send references in search results */
 		assert( refs == NULL );
@@ -503,7 +504,6 @@ send_search_entry(
 	BerElement	*ber;
 	Attribute	*a;
 	int		i, rc=-1, bytes;
-	AccessControl	*acl;
 	char            *edn;
 	int		userattrs;
 	int		opattrs;
@@ -549,8 +549,6 @@ send_search_entry(
 		: charray_inlist( attrs, LDAP_ALL_OPERATIONAL_ATTRIBUTES );
 
 	for ( a = e->e_attrs; a != NULL; a = a->a_next ) {
-		regmatch_t       matches[MAXREMATCHES];
-
 		if ( attrs == NULL ) {
 			/* all addrs request, skip operational attributes */
 			if( !opattrs && oc_check_operational_attr( a->a_type ) ) {
@@ -625,8 +623,6 @@ send_search_entry(
 	a = backend_subschemasubentry( be );
 	
 	do {
-		regmatch_t       matches[MAXREMATCHES];
-
 		if ( attrs == NULL ) {
 			/* all addrs request, skip operational attributes */
 			if( !opattrs && oc_check_operational_attr( a->a_type ) ) {