silence warning

[openldap] / servers / slapd / ava.c

diff --git a/servers/slapd/ava.c b/servers/slapd/ava.c
index 14112134cf0fa29c979504a3592c092ac1bab6e1..48c9b5a03f8c2516c91e9b39db324e721bfe6ac6 100644 (file)
--- a/servers/slapd/ava.c
+++ b/servers/slapd/ava.c
@@ -33,6 +33,9 @@
 
 #include "slap.h"
 
+#ifdef LDAP_COMP_MATCH
+#include "component.h"
+#endif
 
 void
 ava_free(
@@ -40,6 +43,10 @@ ava_free(
        AttributeAssertion *ava,
        int     freeit )
 {
+#ifdef LDAP_COMP_MATCH
+       if ( ava->aa_cf && ava->aa_cf->cf_ca->ca_comp_data.cd_mem_op )
+               nibble_mem_free ( ava->aa_cf->cf_ca->ca_comp_data.cd_mem_op );
+#endif
        op->o_tmpfree( ava->aa_value.bv_val, op->o_tmpmemctx );
        if ( freeit ) op->o_tmpfree( (char *) ava, op->o_tmpmemctx );
 }
@@ -56,6 +63,9 @@ get_ava(
        ber_tag_t rtag;
        struct berval type, value;
        AttributeAssertion *aa;
+#ifdef LDAP_COMP_MATCH
+       AttributeAliasing* a_alias = NULL;
+#endif
 
        rtag = ber_scanf( ber, "{mm}", &type, &value );
 
@@ -68,6 +78,9 @@ get_ava(
        aa = op->o_tmpalloc( sizeof( AttributeAssertion ), op->o_tmpmemctx );
        aa->aa_desc = NULL;
        aa->aa_value.bv_val = NULL;
+#ifdef LDAP_COMP_MATCH
+       aa->aa_cf = NULL;
+#endif
 
        rc = slap_bv2ad( &type, &aa->aa_desc, text );
 
@@ -89,6 +102,19 @@ get_ava(
                return rc;
        }
 
+#ifdef LDAP_COMP_MATCH
+       if( is_aliased_attribute ) {
+               a_alias = is_aliased_attribute ( aa->aa_desc );
+               if ( a_alias ) {
+                       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 );
+                               return rc;
+                       }
+               }
+       }
+#endif
        *ava = aa;
        return LDAP_SUCCESS;
 }