reset the conn field in the cached connection if the bound DN is privileged (ITS...

[openldap] / servers / slapd / ava.c

diff --git a/servers/slapd/ava.c b/servers/slapd/ava.c
index bf43ec5dea5f57453cabb0f651607750259dcb31..888a4404a505cbe07cd6e81e0c481cea2c71b548 100644 (file)
--- a/servers/slapd/ava.c
+++ b/servers/slapd/ava.c
@@ -1,9 +1,28 @@
+/* ava.c - routines for dealing with attribute value assertions */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2006 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+/* Portions Copyright (c) 1995 Regents of the University of Michigan.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of Michigan at Ann Arbor. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
  */
-/* ava.c - routines for dealing with attribute value assertions */
 
 #include "portable.h"
 
@@ -14,19 +33,22 @@
 
 #include "slap.h"
 
+#ifdef LDAP_COMP_MATCH
+#include "component.h"
+#endif
 
 void
 ava_free(
        Operation *op,
        AttributeAssertion *ava,
-       int     freeit
-)
+       int     freeit )
 {
-       /* op->o_tmpfree( ava->aa_value.bv_val, op->o_tmpmemctx ); */
-       ch_free( ava->aa_value.bv_val );
-       if ( freeit ) {
-               op->o_tmpfree( (char *) ava, op->o_tmpmemctx );
-       }
+#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 );
 }
 
 int
@@ -35,22 +57,20 @@ get_ava(
        BerElement      *ber,
        AttributeAssertion      **ava,
        unsigned usage,
-       const char **text
-)
+       const char **text )
 {
        int rc;
        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 );
 
        if( rtag == LBER_ERROR ) {
-#ifdef NEW_LOGGING
-               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
                *text = "Error decoding attribute value assertion";
                return SLAPD_DISCONNECT;
        }
@@ -58,24 +78,48 @@ 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 );
 
        if( rc != LDAP_SUCCESS ) {
-               op->o_tmpfree( aa, op->o_tmpmemctx );
-               return rc;
+               rc = slap_bv2undef_ad( &type, &aa->aa_desc, text,
+                               SLAP_AD_PROXIED|SLAP_AD_NOINSERT );
+
+               if( rc != LDAP_SUCCESS ) {
+                       Debug( LDAP_DEBUG_FILTER,
+                       "get_ava: unknown attributeType %s\n", type.bv_val, 0, 0 );
+                       op->o_tmpfree( aa, op->o_tmpmemctx );
+                       return rc;
+               }
        }
 
        rc = asserted_value_validate_normalize(
                aa->aa_desc, ad_mr(aa->aa_desc, usage),
-               usage, &value, &aa->aa_value, text );
+               usage, &value, &aa->aa_value, text, op->o_tmpmemctx );
 
        if( rc != LDAP_SUCCESS ) {
+               Debug( LDAP_DEBUG_FILTER,
+               "get_ava: illegal value for attributeType %s\n", type.bv_val, 0, 0 );
                op->o_tmpfree( aa, op->o_tmpmemctx );
                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;
 }