Commit of the Proxy Cache contribution (ITS#2062)

[openldap] / servers / slapd / ava.c

diff --git a/servers/slapd/ava.c b/servers/slapd/ava.c
index c521993c54bf3b9c66c667357e96ec052b9b444d..4a30f6417419b699d9f9acc606c66d5bafbb48b6 100644 (file)
--- a/servers/slapd/ava.c
+++ b/servers/slapd/ava.c
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /* ava.c - routines for dealing with attribute value assertions */
@@ -44,8 +44,7 @@ get_ava(
 
        if( rtag == LBER_ERROR ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "filter", LDAP_LEVEL_ERR,
-                          "get_ava:  ber_scanf failure\n" ));
+               LDAP_LOG( FILTER, ERR, "get_ava:  ber_scanf failure\n", 0, 0, 0 );
 #else
                Debug( LDAP_DEBUG_ANY, "  get_ava ber_scanf\n", 0, 0, 0 );
 #endif
@@ -64,8 +63,14 @@ get_ava(
                return rc;
        }
 
+#ifdef SLAP_NVALUES
+       rc = asserted_value_validate_normalize(
+               aa->aa_desc, ad_mr(aa->aa_desc, usage),
+               usage, &value, &aa->aa_value, text );
+#else
        rc = value_validate_normalize( aa->aa_desc, usage,
                &value, &aa->aa_value, text );
+#endif
 
        if( rc != LDAP_SUCCESS ) {
                ch_free( aa );