From: Pierangelo Masarati <ando@openldap.org>
Date: Mon, 31 Jan 2011 21:33:54 +0000 (+0000)
Subject: do not cause f_result to override undefined ava
X-Git-Tag: MIGRATION_CVS2GIT~153
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=6d35c255d38a2753d59a373b69c9e4c2e0803554;p=openldap

do not cause f_result to override undefined ava
---

diff --git a/servers/slapd/ava.c b/servers/slapd/ava.c
index 94a7047a63..1292cb0669 100644
--- a/servers/slapd/ava.c
+++ b/servers/slapd/ava.c
@@ -98,7 +98,7 @@ get_ava(
 			aa->aa_desc = slap_bv2tmp_ad( &type, op->o_tmpmemctx );
 			ber_dupbv_x( &aa->aa_value, &value, op->o_tmpmemctx );
 			f->f_ava = aa;
-			return rc;
+			return LDAP_SUCCESS;
 		}
 	}
 
@@ -122,7 +122,7 @@ get_ava(
 			rc = get_aliased_filter_aa ( op, aa, a_alias, text );
 			if( rc != LDAP_SUCCESS ) {
 				Debug( LDAP_DEBUG_FILTER,
-						"get_ava:Invalid Attribute Aliasing\n", 0, 0, 0 );
+						"get_ava: Invalid Attribute Aliasing\n", 0, 0, 0 );
 				return rc;
 			}
 		}