X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Ffilter.c;h=27e404c195d9d04352dfe9d9a95a0aa2bdd37732;hb=9647ccd9456b8781066dbba5a063bf6c6c9dab6d;hp=7ebb6ddb19475e8ce1abcb2cc6975ba9eb51296a;hpb=1a55430c6519f113e65d7c7e6351cdf873fbcc82;p=openldap
diff --git a/servers/slapd/filter.c b/servers/slapd/filter.c
index 7ebb6ddb19..27e404c195 100644
--- a/servers/slapd/filter.c
+++ b/servers/slapd/filter.c
@@ -1,8 +1,27 @@
/* filter.c - routines for parsing and dealing with filters */
/* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software .
+ *
+ * Copyright 1998-2003 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
+ * .
+ */
+/* 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.
*/
#include "portable.h"
@@ -15,34 +34,36 @@
#include "slap.h"
static int get_filter_list(
- Connection *conn,
+ Operation *op,
BerElement *ber,
Filter **f,
const char **text );
-static int get_substring_filter(
- Connection *conn,
+static int get_ssa(
+ Operation *op,
BerElement *ber,
- Filter *f,
+ SubstringsAssertion **s,
const char **text );
+static int filter_escape_value_x(
+ struct berval *in,
+ struct berval *out,
+ void *ctx );
+
static void simple_vrFilter2bv(
+ Operation *op,
ValuesReturnFilter *f,
struct berval *fstr );
static int get_simple_vrFilter(
- Connection *conn,
+ Operation *op,
BerElement *ber,
ValuesReturnFilter **f,
const char **text );
-#ifdef SLAP_NVALUES
-#define XXX 1
-#endif
-
int
get_filter(
- Connection *conn,
+ Operation *op,
BerElement *ber,
Filter **filt,
const char **text )
@@ -53,7 +74,7 @@ get_filter(
Filter f;
#ifdef NEW_LOGGING
- LDAP_LOG( FILTER, ENTRY, "get_filter: conn %d\n", conn->c_connid, 0, 0 );
+ LDAP_LOG( FILTER, ENTRY, "get_filter: conn %d\n", op->o_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_FILTER, "begin get_filter\n", 0, 0, 0 );
#endif
@@ -106,11 +127,11 @@ get_filter(
case LDAP_FILTER_EQUALITY:
#ifdef NEW_LOGGING
LDAP_LOG( FILTER, DETAIL2,
- "get_filter: conn %d EQUALITY\n", conn->c_connid, 0, 0 );
+ "get_filter: conn %d EQUALITY\n", op->o_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_FILTER, "EQUALITY\n", 0, 0, 0 );
#endif
- err = get_ava( ber, &f.f_ava, SLAP_MR_EQUALITY, text );
+ err = get_ava( op, ber, &f.f_ava, SLAP_MR_EQUALITY, text );
if ( err != LDAP_SUCCESS ) {
break;
}
@@ -121,11 +142,11 @@ get_filter(
case LDAP_FILTER_SUBSTRINGS:
#ifdef NEW_LOGGING
LDAP_LOG( FILTER, DETAIL1,
- "get_filter: conn %d SUBSTRINGS\n", conn->c_connid, 0, 0 );
+ "get_filter: conn %d SUBSTRINGS\n", op->o_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_FILTER, "SUBSTRINGS\n", 0, 0, 0 );
#endif
- err = get_substring_filter( conn, ber, &f, text );
+ err = get_ssa( op, ber, &f.f_sub, text );
if( err != LDAP_SUCCESS ) {
break;
}
@@ -135,11 +156,11 @@ get_filter(
case LDAP_FILTER_GE:
#ifdef NEW_LOGGING
LDAP_LOG( FILTER, DETAIL1,
- "get_filter: conn %d GE\n", conn->c_connid, 0, 0 );
+ "get_filter: conn %d GE\n", op->o_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_FILTER, "GE\n", 0, 0, 0 );
#endif
- err = get_ava( ber, &f.f_ava, SLAP_MR_ORDERING, text );
+ err = get_ava( op, ber, &f.f_ava, SLAP_MR_ORDERING, text );
if ( err != LDAP_SUCCESS ) {
break;
}
@@ -149,11 +170,11 @@ get_filter(
case LDAP_FILTER_LE:
#ifdef NEW_LOGGING
LDAP_LOG( FILTER, DETAIL1,
- "get_filter: conn %d LE\n", conn->c_connid, 0, 0 );
+ "get_filter: conn %d LE\n", op->o_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_FILTER, "LE\n", 0, 0, 0 );
#endif
- err = get_ava( ber, &f.f_ava, SLAP_MR_ORDERING, text );
+ err = get_ava( op, ber, &f.f_ava, SLAP_MR_ORDERING, text );
if ( err != LDAP_SUCCESS ) {
break;
}
@@ -165,7 +186,7 @@ get_filter(
#ifdef NEW_LOGGING
LDAP_LOG( FILTER, DETAIL1,
- "get_filter: conn %d PRESENT\n", conn->c_connid, 0, 0 );
+ "get_filter: conn %d PRESENT\n", op->o_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_FILTER, "PRESENT\n", 0, 0, 0 );
#endif
@@ -183,6 +204,7 @@ get_filter(
f.f_choice = SLAPD_FILTER_COMPUTED;
f.f_result = LDAP_COMPARE_FALSE;
err = LDAP_SUCCESS;
+ *text = NULL;
break;
}
@@ -192,11 +214,11 @@ get_filter(
case LDAP_FILTER_APPROX:
#ifdef NEW_LOGGING
LDAP_LOG( FILTER, DETAIL1,
- "get_filter: conn %d APPROX\n", conn->c_connid, 0, 0 );
+ "get_filter: conn %d APPROX\n", op->o_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_FILTER, "APPROX\n", 0, 0, 0 );
#endif
- err = get_ava( ber, &f.f_ava, SLAP_MR_EQUALITY_APPROX, text );
+ err = get_ava( op, ber, &f.f_ava, SLAP_MR_EQUALITY_APPROX, text );
if ( err != LDAP_SUCCESS ) {
break;
}
@@ -206,65 +228,86 @@ get_filter(
case LDAP_FILTER_AND:
#ifdef NEW_LOGGING
LDAP_LOG( FILTER, DETAIL1,
- "get_filter: conn %d AND\n", conn->c_connid, 0, 0 );
+ "get_filter: conn %d AND\n", op->o_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_FILTER, "AND\n", 0, 0, 0 );
#endif
- err = get_filter_list( conn, ber, &f.f_and, text );
+ err = get_filter_list( op, ber, &f.f_and, text );
if ( err != LDAP_SUCCESS ) {
break;
}
+ if ( f.f_and == NULL ) {
+ f.f_choice = SLAPD_FILTER_COMPUTED;
+ f.f_result = LDAP_COMPARE_TRUE;
+ }
/* no assert - list could be empty */
break;
case LDAP_FILTER_OR:
#ifdef NEW_LOGGING
LDAP_LOG( FILTER, DETAIL1,
- "get_filter: conn %d OR\n", conn->c_connid, 0, 0 );
+ "get_filter: conn %d OR\n", op->o_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_FILTER, "OR\n", 0, 0, 0 );
#endif
- err = get_filter_list( conn, ber, &f.f_or, text );
+ err = get_filter_list( op, ber, &f.f_or, text );
if ( err != LDAP_SUCCESS ) {
break;
}
+ if ( f.f_or == NULL ) {
+ f.f_choice = SLAPD_FILTER_COMPUTED;
+ f.f_result = LDAP_COMPARE_FALSE;
+ }
/* no assert - list could be empty */
break;
case LDAP_FILTER_NOT:
#ifdef NEW_LOGGING
LDAP_LOG( FILTER, DETAIL1,
- "get_filter: conn %d NOT\n", conn->c_connid, 0, 0 );
+ "get_filter: conn %d NOT\n", op->o_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_FILTER, "NOT\n", 0, 0, 0 );
#endif
(void) ber_skip_tag( ber, &len );
- err = get_filter( conn, ber, &f.f_not, text );
+ err = get_filter( op, ber, &f.f_not, text );
if ( err != LDAP_SUCCESS ) {
break;
}
-#ifdef XXX
assert( f.f_not != NULL );
-#endif
+ if ( f.f_not->f_choice == SLAPD_FILTER_COMPUTED ) {
+ int fresult = f.f_not->f_result;
+ f.f_choice = SLAPD_FILTER_COMPUTED;
+ op->o_tmpfree( f.f_not, op->o_tmpmemctx );
+ f.f_not = NULL;
+
+ switch( fresult ) {
+ case LDAP_COMPARE_TRUE:
+ f.f_result = LDAP_COMPARE_FALSE;
+ break;
+ case LDAP_COMPARE_FALSE:
+ f.f_result = LDAP_COMPARE_TRUE;
+ break;
+ default: ;
+ /* (!Undefined) is Undefined */
+ }
+ }
break;
case LDAP_FILTER_EXT:
#ifdef NEW_LOGGING
LDAP_LOG( FILTER, DETAIL1,
- "get_filter: conn %d EXTENSIBLE\n", conn->c_connid, 0, 0 );
+ "get_filter: conn %d EXTENSIBLE\n", op->o_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_FILTER, "EXTENSIBLE\n", 0, 0, 0 );
#endif
- err = get_mra( ber, &f.f_mra, text );
+ err = get_mra( op, ber, &f.f_mra, text );
if ( err != LDAP_SUCCESS ) {
break;
}
-#ifdef XXX
assert( f.f_mra != NULL );
-#endif
break;
default:
@@ -272,7 +315,7 @@ get_filter(
#ifdef NEW_LOGGING
LDAP_LOG( FILTER, ERR,
"get_filter: conn %d unknown filter type=%lu\n",
- conn->c_connid, f.f_choice, 0 );
+ op->o_connid, f.f_choice, 0 );
#else
Debug( LDAP_DEBUG_ANY, "get_filter: unknown filter type=%lu\n",
f.f_choice, 0, 0 );
@@ -284,19 +327,20 @@ get_filter(
if( err != LDAP_SUCCESS && err != SLAPD_DISCONNECT ) {
/* ignore error */
+ *text = NULL;
f.f_choice = SLAPD_FILTER_COMPUTED;
f.f_result = SLAPD_COMPARE_UNDEFINED;
err = LDAP_SUCCESS;
}
if ( err == LDAP_SUCCESS ) {
- *filt = ch_malloc( sizeof(f) );
+ *filt = op->o_tmpalloc( sizeof(f), op->o_tmpmemctx );
**filt = f;
}
#ifdef NEW_LOGGING
LDAP_LOG( FILTER, DETAIL2,
- "get_filter: conn %d exit\n", conn->c_connid, 0, 0 );
+ "get_filter: conn %d exit\n", op->o_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_FILTER, "end get_filter %d\n", err, 0, 0 );
#endif
@@ -305,7 +349,7 @@ get_filter(
}
static int
-get_filter_list( Connection *conn, BerElement *ber,
+get_filter_list( Operation *op, BerElement *ber,
Filter **f,
const char **text )
{
@@ -317,7 +361,7 @@ get_filter_list( Connection *conn, BerElement *ber,
#ifdef NEW_LOGGING
LDAP_LOG( FILTER, ENTRY,
- "get_filter_list: conn %d start\n", conn->c_connid, 0, 0 );
+ "get_filter_list: conn %d start\n", op->o_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_FILTER, "begin get_filter_list\n", 0, 0, 0 );
#endif
@@ -326,7 +370,7 @@ get_filter_list( Connection *conn, BerElement *ber,
tag != LBER_DEFAULT;
tag = ber_next_element( ber, &len, last ) )
{
- err = get_filter( conn, ber, new, text );
+ err = get_filter( op, ber, new, text );
if ( err != LDAP_SUCCESS )
return( err );
new = &(*new)->f_next;
@@ -335,7 +379,7 @@ get_filter_list( Connection *conn, BerElement *ber,
#ifdef NEW_LOGGING
LDAP_LOG( FILTER, ENTRY,
- "get_filter_list: conn %d exit\n", conn->c_connid, 0, 0 );
+ "get_filter_list: conn %d exit\n", op->o_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_FILTER, "end get_filter_list\n", 0, 0, 0 );
#endif
@@ -343,10 +387,10 @@ get_filter_list( Connection *conn, BerElement *ber,
}
static int
-get_substring_filter(
- Connection *conn,
+get_ssa(
+ Operation *op,
BerElement *ber,
- Filter *f,
+ SubstringsAssertion **out,
const char **text )
{
ber_tag_t tag;
@@ -360,17 +404,15 @@ get_substring_filter(
#ifdef NEW_LOGGING
LDAP_LOG( FILTER, ENTRY,
- "get_substring_filter: conn %d begin\n", conn->c_connid, 0, 0 );
+ "get_ssa: conn %d begin\n", op->o_connid, 0, 0 );
#else
- Debug( LDAP_DEBUG_FILTER, "begin get_substring_filter\n", 0, 0, 0 );
+ Debug( LDAP_DEBUG_FILTER, "begin get_ssa\n", 0, 0, 0 );
#endif
if ( ber_scanf( ber, "{m" /*}*/, &desc ) == LBER_ERROR ) {
return SLAPD_DISCONNECT;
}
*text = NULL;
- f->f_choice = SLAPD_FILTER_COMPUTED;
- f->f_result = SLAPD_COMPARE_UNDEFINED;
ssa.sa_desc = NULL;
ssa.sa_initial.bv_val = NULL;
@@ -380,7 +422,13 @@ get_substring_filter(
rc = slap_bv2ad( &desc, &ssa.sa_desc, text );
if( rc != LDAP_SUCCESS ) {
- return LDAP_SUCCESS;
+ /* skip over the rest of this filter */
+ for ( tag = ber_first_element( ber, &len, &last );
+ tag != LBER_DEFAULT;
+ tag = ber_next_element( ber, &len, last ) ) {
+ ber_scanf( ber, "x" );
+ }
+ return rc;
}
rc = LDAP_PROTOCOL_ERROR;
@@ -398,7 +446,6 @@ get_substring_filter(
}
if ( value.bv_val == NULL || value.bv_len == 0 ) {
- free( value.bv_val );
rc = LDAP_INVALID_SYNTAX;
goto return_error;
}
@@ -422,45 +469,24 @@ get_substring_filter(
#ifdef NEW_LOGGING
LDAP_LOG( FILTER, ERR,
"get_filter_substring: conn %d unknown substring choice=%ld\n",
- conn->c_connid, (long)tag, 0 );
+ op->o_connid, (long)tag, 0 );
#else
Debug( LDAP_DEBUG_FILTER,
" unknown substring choice=%ld\n",
(long) tag, 0, 0 );
#endif
- free( value.bv_val );
goto return_error;
}
-#ifdef SLAP_NVALUES
/* validate/normalize using equality matching rule validator! */
rc = asserted_value_validate_normalize(
ssa.sa_desc, ssa.sa_desc->ad_type->sat_equality,
- usage, &value, &nvalue, text );
-
- if( rc != LDAP_SUCCESS ) {
- free( value.bv_val );
- goto return_error;
- }
-#else
- /* validate using equality matching rule validator! */
- rc = value_validate( ssa.sa_desc->ad_type->sat_equality,
- &value, text );
- if( rc != LDAP_SUCCESS ) {
- free( value.bv_val );
- goto return_error;
- }
-
- rc = value_normalize( ssa.sa_desc, usage,
- &value, &nvalue, text );
-
- free( value.bv_val );
+ usage, &value, &nvalue, text, op->o_tmpmemctx );
if( rc != LDAP_SUCCESS ) {
goto return_error;
}
-#endif
rc = LDAP_PROTOCOL_ERROR;
@@ -468,8 +494,8 @@ get_substring_filter(
case LDAP_SUBSTRING_INITIAL:
#ifdef NEW_LOGGING
LDAP_LOG( FILTER, DETAIL1,
- "get_substring_filter: conn %d INITIAL\n",
- conn->c_connid, 0, 0 );
+ "get_ssa: conn %d INITIAL\n",
+ op->o_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_FILTER, " INITIAL\n", 0, 0, 0 );
#endif
@@ -478,7 +504,7 @@ get_substring_filter(
|| ssa.sa_any != NULL
|| ssa.sa_final.bv_val != NULL )
{
- free( nvalue.bv_val );
+ sl_free( nvalue.bv_val, op->o_tmpmemctx );
goto return_error;
}
@@ -488,31 +514,31 @@ get_substring_filter(
case LDAP_SUBSTRING_ANY:
#ifdef NEW_LOGGING
LDAP_LOG( FILTER, DETAIL1,
- "get_substring_filter: conn %d ANY\n",
- conn->c_connid, 0, 0 );
+ "get_ssa: conn %d ANY\n",
+ op->o_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_FILTER, " ANY\n", 0, 0, 0 );
#endif
if ( ssa.sa_final.bv_val != NULL ) {
- free( nvalue.bv_val );
+ sl_free( nvalue.bv_val, op->o_tmpmemctx );
goto return_error;
}
- ber_bvarray_add( &ssa.sa_any, &nvalue );
+ ber_bvarray_add_x( &ssa.sa_any, &nvalue, op->o_tmpmemctx );
break;
case LDAP_SUBSTRING_FINAL:
#ifdef NEW_LOGGING
LDAP_LOG( FILTER, DETAIL1,
- "get_substring_filter: conn %d FINAL\n",
- conn->c_connid, 0, 0 );
+ "get_ssa: conn %d FINAL\n",
+ op->o_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_FILTER, " FINAL\n", 0, 0, 0 );
#endif
if ( ssa.sa_final.bv_val != NULL ) {
- free( nvalue.bv_val );
+ sl_free( nvalue.bv_val, op->o_tmpmemctx );
goto return_error;
}
@@ -522,8 +548,8 @@ get_substring_filter(
default:
#ifdef NEW_LOGGING
LDAP_LOG( FILTER, INFO,
- "get_substring_filter: conn %d unknown substring type %ld\n",
- conn->c_connid, (long)tag, 0 );
+ "get_ssa: conn %d unknown substring type %ld\n",
+ op->o_connid, (long)tag, 0 );
#else
Debug( LDAP_DEBUG_FILTER,
" unknown substring type=%ld\n",
@@ -531,20 +557,20 @@ get_substring_filter(
#endif
assert( 0 );
- free( nvalue.bv_val );
+ sl_free( nvalue.bv_val, op->o_tmpmemctx );
return_error:
#ifdef NEW_LOGGING
LDAP_LOG( FILTER, INFO,
- "get_substring_filter: conn %d error %ld\n",
- conn->c_connid, (long)rc, 0 );
+ "get_ssa: conn %d error %ld\n",
+ op->o_connid, (long)rc, 0 );
#else
Debug( LDAP_DEBUG_FILTER, " error=%ld\n",
(long) rc, 0, 0 );
#endif
- free( ssa.sa_initial.bv_val );
- ber_bvarray_free( ssa.sa_any );
- free( ssa.sa_final.bv_val );
+ sl_free( ssa.sa_initial.bv_val, op->o_tmpmemctx );
+ ber_bvarray_free_x( ssa.sa_any, op->o_tmpmemctx );
+ sl_free( ssa.sa_final.bv_val, op->o_tmpmemctx );
return rc;
}
@@ -552,23 +578,22 @@ return_error:
}
if( rc == LDAP_SUCCESS ) {
- f->f_choice = LDAP_FILTER_SUBSTRINGS;
- f->f_sub = ch_malloc( sizeof( ssa ) );
- *f->f_sub = ssa;
+ *out = op->o_tmpalloc( sizeof( ssa ), op->o_tmpmemctx );
+ **out = ssa;
}
#ifdef NEW_LOGGING
LDAP_LOG( FILTER, ENTRY,
- "get_substring_filter: conn %d exit\n", conn->c_connid, 0, 0 );
+ "get_ssa: conn %d exit\n", op->o_connid, 0, 0 );
#else
- Debug( LDAP_DEBUG_FILTER, "end get_substring_filter\n", 0, 0, 0 );
+ Debug( LDAP_DEBUG_FILTER, "end get_ssa\n", 0, 0, 0 );
#endif
return LDAP_SUCCESS;
}
void
-filter_free( Filter *f )
+filter_free_x( Operation *op, Filter *f )
{
Filter *p, *next;
@@ -584,18 +609,18 @@ filter_free( Filter *f )
case LDAP_FILTER_GE:
case LDAP_FILTER_LE:
case LDAP_FILTER_APPROX:
- ava_free( f->f_ava, 1 );
+ ava_free( op, f->f_ava, 1 );
break;
case LDAP_FILTER_SUBSTRINGS:
if ( f->f_sub_initial.bv_val != NULL ) {
- free( f->f_sub_initial.bv_val );
+ op->o_tmpfree( f->f_sub_initial.bv_val, op->o_tmpmemctx );
}
- ber_bvarray_free( f->f_sub_any );
+ ber_bvarray_free_x( f->f_sub_any, op->o_tmpmemctx );
if ( f->f_sub_final.bv_val != NULL ) {
- free( f->f_sub_final.bv_val );
+ op->o_tmpfree( f->f_sub_final.bv_val, op->o_tmpmemctx );
}
- ch_free( f->f_sub );
+ op->o_tmpfree( f->f_sub, op->o_tmpmemctx );
break;
case LDAP_FILTER_AND:
@@ -603,12 +628,12 @@ filter_free( Filter *f )
case LDAP_FILTER_NOT:
for ( p = f->f_list; p != NULL; p = next ) {
next = p->f_next;
- filter_free( p );
+ filter_free_x( op, p );
}
break;
case LDAP_FILTER_EXT:
- mra_free( f->f_mra, 1 );
+ mra_free( op, f->f_mra, 1 );
break;
case SLAPD_FILTER_COMPUTED:
@@ -625,11 +650,21 @@ filter_free( Filter *f )
break;
}
- free( f );
+ op->o_tmpfree( f, op->o_tmpmemctx );
}
void
-filter2bv( Filter *f, struct berval *fstr )
+filter_free( Filter *f )
+{
+ Operation op;
+
+ op.o_tmpmemctx = sl_context( f );
+ op.o_tmpmfuncs = &sl_mfuncs;
+ filter_free_x( &op, f );
+}
+
+void
+filter2bv_x( Operation *op, Filter *f, struct berval *fstr )
{
int i;
Filter *p;
@@ -637,70 +672,70 @@ filter2bv( Filter *f, struct berval *fstr )
ber_len_t len;
if ( f == NULL ) {
- ber_str2bv( "No filter!", sizeof("No filter!")-1, 1, fstr );
+ ber_str2bv_x( "No filter!", sizeof("No filter!")-1, 1, fstr, op->o_tmpmemctx );
return;
}
switch ( f->f_choice ) {
case LDAP_FILTER_EQUALITY:
- filter_escape_value( &f->f_av_value, &tmp );
+ filter_escape_value_x( &f->f_av_value, &tmp, op->o_tmpmemctx );
fstr->bv_len = f->f_av_desc->ad_cname.bv_len +
tmp.bv_len + ( sizeof("(=)") - 1 );
- fstr->bv_val = ch_malloc( fstr->bv_len + 1 );
+ fstr->bv_val = op->o_tmpalloc( fstr->bv_len + 1, op->o_tmpmemctx );
snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s=%s)",
f->f_av_desc->ad_cname.bv_val,
tmp.bv_val );
- ber_memfree( tmp.bv_val );
+ ber_memfree_x( tmp.bv_val, op->o_tmpmemctx );
break;
case LDAP_FILTER_GE:
- filter_escape_value( &f->f_av_value, &tmp );
+ filter_escape_value_x( &f->f_av_value, &tmp, op->o_tmpmemctx );
fstr->bv_len = f->f_av_desc->ad_cname.bv_len +
tmp.bv_len + ( sizeof("(>=)") - 1 );
- fstr->bv_val = ch_malloc( fstr->bv_len + 1 );
+ fstr->bv_val = op->o_tmpalloc( fstr->bv_len + 1, op->o_tmpmemctx );
snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s>=%s)",
f->f_av_desc->ad_cname.bv_val,
tmp.bv_val );
- ber_memfree( tmp.bv_val );
+ ber_memfree_x( tmp.bv_val, op->o_tmpmemctx );
break;
case LDAP_FILTER_LE:
- filter_escape_value( &f->f_av_value, &tmp );
+ filter_escape_value_x( &f->f_av_value, &tmp, op->o_tmpmemctx );
fstr->bv_len = f->f_av_desc->ad_cname.bv_len +
tmp.bv_len + ( sizeof("(<=)") - 1 );
- fstr->bv_val = ch_malloc( fstr->bv_len + 1 );
+ fstr->bv_val = op->o_tmpalloc( fstr->bv_len + 1, op->o_tmpmemctx );
snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s<=%s)",
f->f_av_desc->ad_cname.bv_val,
tmp.bv_val );
- ber_memfree( tmp.bv_val );
+ ber_memfree_x( tmp.bv_val, op->o_tmpmemctx );
break;
case LDAP_FILTER_APPROX:
- filter_escape_value( &f->f_av_value, &tmp );
+ filter_escape_value_x( &f->f_av_value, &tmp, op->o_tmpmemctx );
fstr->bv_len = f->f_av_desc->ad_cname.bv_len +
tmp.bv_len + ( sizeof("(~=)") - 1 );
- fstr->bv_val = ch_malloc( fstr->bv_len + 1 );
+ fstr->bv_val = op->o_tmpalloc( fstr->bv_len + 1, op->o_tmpmemctx );
snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s~=%s)",
f->f_av_desc->ad_cname.bv_val,
tmp.bv_val );
- ber_memfree( tmp.bv_val );
+ ber_memfree_x( tmp.bv_val, op->o_tmpmemctx );
break;
case LDAP_FILTER_SUBSTRINGS:
fstr->bv_len = f->f_sub_desc->ad_cname.bv_len +
( sizeof("(=*)") - 1 );
- fstr->bv_val = ch_malloc( fstr->bv_len + 128 );
+ fstr->bv_val = op->o_tmpalloc( fstr->bv_len + 128, op->o_tmpmemctx );
snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s=*)",
f->f_sub_desc->ad_cname.bv_val );
@@ -708,46 +743,46 @@ filter2bv( Filter *f, struct berval *fstr )
if ( f->f_sub_initial.bv_val != NULL ) {
len = fstr->bv_len;
- filter_escape_value( &f->f_sub_initial, &tmp );
+ filter_escape_value_x( &f->f_sub_initial, &tmp, op->o_tmpmemctx );
fstr->bv_len += tmp.bv_len;
- fstr->bv_val = ch_realloc( fstr->bv_val, fstr->bv_len + 1 );
+ fstr->bv_val = op->o_tmprealloc( fstr->bv_val, fstr->bv_len + 1, op->o_tmpmemctx );
snprintf( &fstr->bv_val[len-2], tmp.bv_len+3,
/* "(attr=" */ "%s*)",
tmp.bv_val );
- ber_memfree( tmp.bv_val );
+ ber_memfree_x( tmp.bv_val, op->o_tmpmemctx );
}
if ( f->f_sub_any != NULL ) {
for ( i = 0; f->f_sub_any[i].bv_val != NULL; i++ ) {
len = fstr->bv_len;
- filter_escape_value( &f->f_sub_any[i], &tmp );
+ filter_escape_value_x( &f->f_sub_any[i], &tmp, op->o_tmpmemctx );
fstr->bv_len += tmp.bv_len + 1;
- fstr->bv_val = ch_realloc( fstr->bv_val, fstr->bv_len + 1 );
+ fstr->bv_val = op->o_tmprealloc( fstr->bv_val, fstr->bv_len + 1, op->o_tmpmemctx );
snprintf( &fstr->bv_val[len-1], tmp.bv_len+3,
/* "(attr=[init]*[any*]" */ "%s*)",
tmp.bv_val );
- ber_memfree( tmp.bv_val );
+ ber_memfree_x( tmp.bv_val, op->o_tmpmemctx );
}
}
if ( f->f_sub_final.bv_val != NULL ) {
len = fstr->bv_len;
- filter_escape_value( &f->f_sub_final, &tmp );
+ filter_escape_value_x( &f->f_sub_final, &tmp, op->o_tmpmemctx );
fstr->bv_len += tmp.bv_len;
- fstr->bv_val = ch_realloc( fstr->bv_val, fstr->bv_len + 1 );
+ fstr->bv_val = op->o_tmprealloc( fstr->bv_val, fstr->bv_len + 1, op->o_tmpmemctx );
snprintf( &fstr->bv_val[len-1], tmp.bv_len+3,
/* "(attr=[init*][any*]" */ "%s)",
tmp.bv_val );
- ber_memfree( tmp.bv_val );
+ ber_memfree_x( tmp.bv_val, op->o_tmpmemctx );
}
break;
@@ -755,7 +790,7 @@ filter2bv( Filter *f, struct berval *fstr )
case LDAP_FILTER_PRESENT:
fstr->bv_len = f->f_desc->ad_cname.bv_len +
( sizeof("(=*)") - 1 );
- fstr->bv_val = ch_malloc( fstr->bv_len + 1 );
+ fstr->bv_val = op->o_tmpalloc( fstr->bv_len + 1, op->o_tmpmemctx );
snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s=*)",
f->f_desc->ad_cname.bv_val );
@@ -765,7 +800,7 @@ filter2bv( Filter *f, struct berval *fstr )
case LDAP_FILTER_OR:
case LDAP_FILTER_NOT:
fstr->bv_len = sizeof("(%)") - 1;
- fstr->bv_val = ch_malloc( fstr->bv_len + 128 );
+ fstr->bv_val = op->o_tmpalloc( fstr->bv_len + 128, op->o_tmpmemctx );
snprintf( fstr->bv_val, fstr->bv_len + 1, "(%c)",
f->f_choice == LDAP_FILTER_AND ? '&' :
@@ -774,22 +809,22 @@ filter2bv( Filter *f, struct berval *fstr )
for ( p = f->f_list; p != NULL; p = p->f_next ) {
len = fstr->bv_len;
- filter2bv( p, &tmp );
+ filter2bv_x( op, p, &tmp );
fstr->bv_len += tmp.bv_len;
- fstr->bv_val = ch_realloc( fstr->bv_val, fstr->bv_len + 1 );
+ fstr->bv_val = op->o_tmprealloc( fstr->bv_val, fstr->bv_len + 1, op->o_tmpmemctx );
snprintf( &fstr->bv_val[len-1], tmp.bv_len + 2,
/*"("*/ "%s)", tmp.bv_val );
- ch_free( tmp.bv_val );
+ op->o_tmpfree( tmp.bv_val, op->o_tmpmemctx );
}
break;
case LDAP_FILTER_EXT: {
struct berval ad;
- filter_escape_value( &f->f_mr_value, &tmp );
+ filter_escape_value_x( &f->f_mr_value, &tmp, op->o_tmpmemctx );
if ( f->f_mr_desc ) {
ad = f->f_mr_desc->ad_cname;
@@ -802,7 +837,7 @@ filter2bv( Filter *f, struct berval *fstr )
( f->f_mr_dnattrs ? sizeof(":dn")-1 : 0 ) +
( f->f_mr_rule_text.bv_len ? f->f_mr_rule_text.bv_len+1 : 0 ) +
tmp.bv_len + ( sizeof("(:=)") - 1 );
- fstr->bv_val = ch_malloc( fstr->bv_len + 1 );
+ fstr->bv_val = op->o_tmpalloc( fstr->bv_len + 1, op->o_tmpmemctx );
snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s%s%s%s:=%s)",
ad.bv_val,
@@ -810,11 +845,11 @@ filter2bv( Filter *f, struct berval *fstr )
f->f_mr_rule_text.bv_len ? ":" : "",
f->f_mr_rule_text.bv_len ? f->f_mr_rule_text.bv_val : "",
tmp.bv_val );
- ber_memfree( tmp.bv_val );
+ ber_memfree_x( tmp.bv_val, op->o_tmpmemctx );
} break;
case SLAPD_FILTER_COMPUTED:
- ber_str2bv(
+ ber_str2bv_x(
f->f_result == LDAP_COMPARE_FALSE ? "(?=false)" :
f->f_result == LDAP_COMPARE_TRUE ? "(?=true)" :
f->f_result == SLAPD_COMPARE_UNDEFINED ? "(?=undefined)" :
@@ -823,25 +858,38 @@ filter2bv( Filter *f, struct berval *fstr )
f->f_result == LDAP_COMPARE_TRUE ? sizeof("(?=true)")-1 :
f->f_result == SLAPD_COMPARE_UNDEFINED ? sizeof("(?=undefined)")-1 :
sizeof("(?=error)")-1,
- 1, fstr );
+ 1, fstr, op->o_tmpmemctx );
break;
default:
- ber_str2bv( "(?=unknown)", sizeof("(?=unknown)")-1, 1, fstr );
+ ber_str2bv_x( "(?=unknown)", sizeof("(?=unknown)")-1,
+ 1, fstr, op->o_tmpmemctx );
break;
}
}
-int
-filter_escape_value(
+void
+filter2bv( Filter *f, struct berval *fstr )
+{
+ Operation op;
+ op.o_tmpmemctx = NULL;
+ op.o_tmpmfuncs = &ch_mfuncs;
+
+ filter2bv_x( &op, f, fstr );
+}
+
+static int
+filter_escape_value_x(
struct berval *in,
- struct berval *out )
+ struct berval *out,
+ void *ctx )
{
ber_len_t i;
assert( in );
assert( out );
- out->bv_val = (char *) ch_malloc( ( in->bv_len * 3 ) + 1 );
+ i = in->bv_len * 3 + 1;
+ out->bv_val = ctx ? sl_malloc( i, ctx ) : ch_malloc( i );
out->bv_len = 0;
for( i=0; i < in->bv_len ; i++ ) {
@@ -858,9 +906,17 @@ filter_escape_value(
return LDAP_SUCCESS;
}
+int
+filter_escape_value(
+ struct berval *in,
+ struct berval *out )
+{
+ return filter_escape_value_x( in, out, NULL );
+}
+
static int
get_simple_vrFilter(
- Connection *conn,
+ Operation *op,
BerElement *ber,
ValuesReturnFilter **filt,
const char **text )
@@ -868,11 +924,11 @@ get_simple_vrFilter(
ber_tag_t tag;
ber_len_t len;
int err;
- ValuesReturnFilter *vrf;
+ ValuesReturnFilter vrf;
#ifdef NEW_LOGGING
LDAP_LOG( FILTER, ENTRY,
- "get_simple_vrFilter: conn %d\n", conn->c_connid, 0, 0 );
+ "get_simple_vrFilter: conn %d\n", op->o_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_FILTER, "begin get_simple_vrFilter\n", 0, 0, 0 );
#endif
@@ -884,46 +940,45 @@ get_simple_vrFilter(
return SLAPD_DISCONNECT;
}
- vrf = (ValuesReturnFilter *) ch_malloc( sizeof(ValuesReturnFilter) );
- vrf->vrf_next = NULL;
+ vrf.vrf_next = NULL;
err = LDAP_SUCCESS;
- vrf->vrf_choice = tag;
+ vrf.vrf_choice = tag;
- switch ( vrf->vrf_choice ) {
+ switch ( vrf.vrf_choice ) {
case LDAP_FILTER_EQUALITY:
#ifdef NEW_LOGGING
LDAP_LOG( FILTER, DETAIL2,
- "get_simple_vrFilter: conn %d EQUALITY\n", conn->c_connid, 0, 0 );
+ "get_simple_vrFilter: conn %d EQUALITY\n", op->o_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_FILTER, "EQUALITY\n", 0, 0, 0 );
#endif
- err = get_ava( ber, &vrf->vrf_ava, SLAP_MR_EQUALITY, text );
+ err = get_ava( op, ber, &vrf.vrf_ava, SLAP_MR_EQUALITY, text );
if ( err != LDAP_SUCCESS ) {
break;
}
- assert( vrf->vrf_ava != NULL );
+ assert( vrf.vrf_ava != NULL );
break;
case LDAP_FILTER_SUBSTRINGS:
#ifdef NEW_LOGGING
LDAP_LOG( FILTER, DETAIL1,
- "get_simple_vrFilter: conn %d SUBSTRINGS\n", conn->c_connid, 0, 0 );
+ "get_simple_vrFilter: conn %d SUBSTRINGS\n", op->o_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_FILTER, "SUBSTRINGS\n", 0, 0, 0 );
#endif
- err = get_substring_filter( conn, ber, (Filter *)vrf, text );
+ err = get_ssa( op, ber, &vrf.vrf_sub, text );
break;
case LDAP_FILTER_GE:
#ifdef NEW_LOGGING
LDAP_LOG( FILTER, DETAIL1,
- "get_simple_vrFilter: conn %d GE\n", conn->c_connid, 0, 0 );
+ "get_simple_vrFilter: conn %d GE\n", op->o_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_FILTER, "GE\n", 0, 0, 0 );
#endif
- err = get_ava( ber, &vrf->vrf_ava, SLAP_MR_ORDERING, text );
+ err = get_ava( op, ber, &vrf.vrf_ava, SLAP_MR_ORDERING, text );
if ( err != LDAP_SUCCESS ) {
break;
}
@@ -932,11 +987,11 @@ get_simple_vrFilter(
case LDAP_FILTER_LE:
#ifdef NEW_LOGGING
LDAP_LOG( FILTER, DETAIL1,
- "get_simple_vrFilter: conn %d LE\n", conn->c_connid, 0, 0 );
+ "get_simple_vrFilter: conn %d LE\n", op->o_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_FILTER, "LE\n", 0, 0, 0 );
#endif
- err = get_ava( ber, &vrf->vrf_ava, SLAP_MR_ORDERING, text );
+ err = get_ava( op, ber, &vrf.vrf_ava, SLAP_MR_ORDERING, text );
if ( err != LDAP_SUCCESS ) {
break;
}
@@ -947,7 +1002,7 @@ get_simple_vrFilter(
#ifdef NEW_LOGGING
LDAP_LOG( FILTER, DETAIL1,
- "get_simple_vrFilter: conn %d PRESENT\n", conn->c_connid, 0, 0 );
+ "get_simple_vrFilter: conn %d PRESENT\n", op->o_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_FILTER, "PRESENT\n", 0, 0, 0 );
#endif
@@ -957,13 +1012,13 @@ get_simple_vrFilter(
break;
}
- vrf->vrf_desc = NULL;
- err = slap_bv2ad( &type, &vrf->vrf_desc, text );
+ vrf.vrf_desc = NULL;
+ err = slap_bv2ad( &type, &vrf.vrf_desc, text );
if( err != LDAP_SUCCESS ) {
/* unrecognized attribute description or other error */
- vrf->vrf_choice = SLAPD_FILTER_COMPUTED;
- vrf->vrf_result = LDAP_COMPARE_FALSE;
+ vrf.vrf_choice = SLAPD_FILTER_COMPUTED;
+ vrf.vrf_result = LDAP_COMPARE_FALSE;
err = LDAP_SUCCESS;
break;
}
@@ -972,11 +1027,11 @@ get_simple_vrFilter(
case LDAP_FILTER_APPROX:
#ifdef NEW_LOGGING
LDAP_LOG( FILTER, DETAIL1,
- "get_simple_vrFilter: conn %d APPROX\n", conn->c_connid, 0, 0 );
+ "get_simple_vrFilter: conn %d APPROX\n", op->o_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_FILTER, "APPROX\n", 0, 0, 0 );
#endif
- err = get_ava( ber, &vrf->vrf_ava, SLAP_MR_EQUALITY_APPROX, text );
+ err = get_ava( op, ber, &vrf.vrf_ava, SLAP_MR_EQUALITY_APPROX, text );
if ( err != LDAP_SUCCESS ) {
break;
}
@@ -985,17 +1040,17 @@ get_simple_vrFilter(
case LDAP_FILTER_EXT:
#ifdef NEW_LOGGING
LDAP_LOG( FILTER, DETAIL1,
- "get_simple_vrFilter: conn %d EXTENSIBLE\n", conn->c_connid, 0, 0 );
+ "get_simple_vrFilter: conn %d EXTENSIBLE\n", op->o_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_FILTER, "EXTENSIBLE\n", 0, 0, 0 );
#endif
- err = get_mra( ber, &vrf->vrf_mra, text );
+ err = get_mra( op, ber, &vrf.vrf_mra, text );
if ( err != LDAP_SUCCESS ) {
break;
}
- assert( vrf->vrf_mra != NULL );
+ assert( vrf.vrf_mra != NULL );
break;
default:
@@ -1003,43 +1058,40 @@ get_simple_vrFilter(
#ifdef NEW_LOGGING
LDAP_LOG( FILTER, ERR,
"get_simple_vrFilter: conn %d unknown filter type=%lu\n",
- conn->c_connid, vrf->vrf_choice, 0 );
+ op->o_connid, vrf.vrf_choice, 0 );
#else
Debug( LDAP_DEBUG_ANY, "get_simple_vrFilter: unknown filter type=%lu\n",
- vrf->vrf_choice, 0, 0 );
+ vrf.vrf_choice, 0, 0 );
#endif
- vrf->vrf_choice = SLAPD_FILTER_COMPUTED;
- vrf->vrf_result = SLAPD_COMPARE_UNDEFINED;
+ vrf.vrf_choice = SLAPD_FILTER_COMPUTED;
+ vrf.vrf_result = SLAPD_COMPARE_UNDEFINED;
break;
}
- if ( err != LDAP_SUCCESS ) {
- if( err != SLAPD_DISCONNECT ) {
- /* ignore error */
- vrf->vrf_choice = SLAPD_FILTER_COMPUTED;
- vrf->vrf_result = SLAPD_COMPARE_UNDEFINED;
- err = LDAP_SUCCESS;
- *filt = vrf;
-
- } else {
- free(vrf);
- }
+ if ( err != LDAP_SUCCESS && err != SLAPD_DISCONNECT ) {
+ /* ignore error */
+ vrf.vrf_choice = SLAPD_FILTER_COMPUTED;
+ vrf.vrf_result = SLAPD_COMPARE_UNDEFINED;
+ err = LDAP_SUCCESS;
+ }
- } else {
- *filt = vrf;
+ if ( err == LDAP_SUCCESS ) {
+ *filt = ch_malloc( sizeof vrf );
+ **filt = vrf;
}
#ifdef NEW_LOGGING
LDAP_LOG( FILTER, DETAIL2,
- "get_simple_vrFilter: conn %d exit\n", conn->c_connid, 0, 0 );
+ "get_simple_vrFilter: conn %d exit\n", op->o_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_FILTER, "end get_simple_vrFilter %d\n", err, 0, 0 );
#endif
- return( err );
+
+ return err;
}
int
-get_vrFilter( Connection *conn, BerElement *ber,
+get_vrFilter( Operation *op, BerElement *ber,
ValuesReturnFilter **vrf,
const char **text )
{
@@ -1079,7 +1131,7 @@ get_vrFilter( Connection *conn, BerElement *ber,
#ifdef NEW_LOGGING
LDAP_LOG( FILTER, ENTRY,
- "get_vrFilter: conn %d start\n", conn->c_connid, 0, 0 );
+ "get_vrFilter: conn %d start\n", op->o_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_FILTER, "begin get_vrFilter\n", 0, 0, 0 );
#endif
@@ -1101,16 +1153,17 @@ get_vrFilter( Connection *conn, BerElement *ber,
tag != LBER_DEFAULT;
tag = ber_next_element( ber, &len, last ) )
{
- int err = get_simple_vrFilter( conn, ber, n, text );
- if ( err != LDAP_SUCCESS )
- return( err );
+ int err = get_simple_vrFilter( op, ber, n, text );
+
+ if ( err != LDAP_SUCCESS ) return( err );
+
n = &(*n)->vrf_next;
}
*n = NULL;
#ifdef NEW_LOGGING
LDAP_LOG( FILTER, ENTRY,
- "get_vrFilter: conn %d exit\n", conn->c_connid, 0, 0 );
+ "get_vrFilter: conn %d exit\n", op->o_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_FILTER, "end get_vrFilter\n", 0, 0, 0 );
#endif
@@ -1118,7 +1171,7 @@ get_vrFilter( Connection *conn, BerElement *ber,
}
void
-vrFilter_free( ValuesReturnFilter *vrf )
+vrFilter_free( Operation *op, ValuesReturnFilter *vrf )
{
ValuesReturnFilter *p, *next;
@@ -1137,22 +1190,22 @@ vrFilter_free( ValuesReturnFilter *vrf )
case LDAP_FILTER_GE:
case LDAP_FILTER_LE:
case LDAP_FILTER_APPROX:
- ava_free( vrf->vrf_ava, 1 );
+ ava_free( op, vrf->vrf_ava, 1 );
break;
case LDAP_FILTER_SUBSTRINGS:
if ( vrf->vrf_sub_initial.bv_val != NULL ) {
- free( vrf->vrf_sub_initial.bv_val );
+ op->o_tmpfree( vrf->vrf_sub_initial.bv_val, op->o_tmpmemctx );
}
- ber_bvarray_free( vrf->vrf_sub_any );
+ ber_bvarray_free_x( vrf->vrf_sub_any, op->o_tmpmemctx );
if ( vrf->vrf_sub_final.bv_val != NULL ) {
- free( vrf->vrf_sub_final.bv_val );
+ op->o_tmpfree( vrf->vrf_sub_final.bv_val, op->o_tmpmemctx );
}
- ch_free( vrf->vrf_sub );
+ op->o_tmpfree( vrf->vrf_sub, op->o_tmpmemctx );
break;
case LDAP_FILTER_EXT:
- mra_free( vrf->vrf_mra, 1 );
+ mra_free( op, vrf->vrf_mra, 1 );
break;
case SLAPD_FILTER_COMPUTED:
@@ -1169,114 +1222,114 @@ vrFilter_free( ValuesReturnFilter *vrf )
break;
}
- free( vrf );
+ op->o_tmpfree( vrf, op->o_tmpmemctx );
}
}
-
void
-vrFilter2bv( ValuesReturnFilter *vrf, struct berval *fstr )
+vrFilter2bv( Operation *op, ValuesReturnFilter *vrf, struct berval *fstr )
{
ValuesReturnFilter *p;
struct berval tmp;
ber_len_t len;
if ( vrf == NULL ) {
- ber_str2bv( "No filter!", sizeof("No filter!")-1, 1, fstr );
+ ber_str2bv_x( "No filter!", sizeof("No filter!")-1,
+ 1, fstr, op->o_tmpmemctx );
return;
}
fstr->bv_len = sizeof("()") - 1;
- fstr->bv_val = ch_malloc( fstr->bv_len + 128 );
+ fstr->bv_val = op->o_tmpalloc( fstr->bv_len + 128, op->o_tmpmemctx );
snprintf( fstr->bv_val, fstr->bv_len + 1, "()");
for ( p = vrf; p != NULL; p = p->vrf_next ) {
len = fstr->bv_len;
- simple_vrFilter2bv( p, &tmp );
+ simple_vrFilter2bv( op, p, &tmp );
fstr->bv_len += tmp.bv_len;
- fstr->bv_val = ch_realloc( fstr->bv_val, fstr->bv_len + 1 );
+ fstr->bv_val = op->o_tmprealloc( fstr->bv_val, fstr->bv_len + 1, op->o_tmpmemctx );
snprintf( &fstr->bv_val[len-1], tmp.bv_len + 2,
/*"("*/ "%s)", tmp.bv_val );
- ch_free( tmp.bv_val );
+ op->o_tmpfree( tmp.bv_val, op->o_tmpmemctx );
}
}
static void
-simple_vrFilter2bv( ValuesReturnFilter *vrf, struct berval *fstr )
+simple_vrFilter2bv( Operation *op, ValuesReturnFilter *vrf, struct berval *fstr )
{
struct berval tmp;
ber_len_t len;
if ( vrf == NULL ) {
- ber_str2bv( "No filter!", sizeof("No filter!")-1, 1, fstr );
+ ber_str2bv_x( "No filter!", sizeof("No filter!")-1, 1, fstr, op->o_tmpmemctx );
return;
}
switch ( vrf->vrf_choice ) {
case LDAP_FILTER_EQUALITY:
- filter_escape_value( &vrf->vrf_av_value, &tmp );
+ filter_escape_value_x( &vrf->vrf_av_value, &tmp, op->o_tmpmemctx );
fstr->bv_len = vrf->vrf_av_desc->ad_cname.bv_len +
tmp.bv_len + ( sizeof("(=)") - 1 );
- fstr->bv_val = ch_malloc( fstr->bv_len + 1 );
+ fstr->bv_val = op->o_tmpalloc( fstr->bv_len + 1, op->o_tmpmemctx );
snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s=%s)",
vrf->vrf_av_desc->ad_cname.bv_val,
tmp.bv_val );
- ber_memfree( tmp.bv_val );
+ ber_memfree_x( tmp.bv_val, op->o_tmpmemctx );
break;
case LDAP_FILTER_GE:
- filter_escape_value( &vrf->vrf_av_value, &tmp );
+ filter_escape_value_x( &vrf->vrf_av_value, &tmp, op->o_tmpmemctx );
fstr->bv_len = vrf->vrf_av_desc->ad_cname.bv_len +
tmp.bv_len + ( sizeof("(>=)") - 1 );
- fstr->bv_val = ch_malloc( fstr->bv_len + 1 );
+ fstr->bv_val = op->o_tmpalloc( fstr->bv_len + 1, op->o_tmpmemctx );
snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s>=%s)",
vrf->vrf_av_desc->ad_cname.bv_val,
tmp.bv_val );
- ber_memfree( tmp.bv_val );
+ ber_memfree_x( tmp.bv_val, op->o_tmpmemctx );
break;
case LDAP_FILTER_LE:
- filter_escape_value( &vrf->vrf_av_value, &tmp );
+ filter_escape_value_x( &vrf->vrf_av_value, &tmp, op->o_tmpmemctx );
fstr->bv_len = vrf->vrf_av_desc->ad_cname.bv_len +
tmp.bv_len + ( sizeof("(<=)") - 1 );
- fstr->bv_val = ch_malloc( fstr->bv_len + 1 );
+ fstr->bv_val = op->o_tmpalloc( fstr->bv_len + 1, op->o_tmpmemctx );
snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s<=%s)",
vrf->vrf_av_desc->ad_cname.bv_val,
tmp.bv_val );
- ber_memfree( tmp.bv_val );
+ ber_memfree_x( tmp.bv_val, op->o_tmpmemctx );
break;
case LDAP_FILTER_APPROX:
- filter_escape_value( &vrf->vrf_av_value, &tmp );
+ filter_escape_value_x( &vrf->vrf_av_value, &tmp, op->o_tmpmemctx );
fstr->bv_len = vrf->vrf_av_desc->ad_cname.bv_len +
tmp.bv_len + ( sizeof("(~=)") - 1 );
- fstr->bv_val = ch_malloc( fstr->bv_len + 1 );
+ fstr->bv_val = op->o_tmpalloc( fstr->bv_len + 1, op->o_tmpmemctx );
snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s~=%s)",
vrf->vrf_av_desc->ad_cname.bv_val,
tmp.bv_val );
- ber_memfree( tmp.bv_val );
+ ber_memfree_x( tmp.bv_val, op->o_tmpmemctx );
break;
case LDAP_FILTER_SUBSTRINGS:
fstr->bv_len = vrf->vrf_sub_desc->ad_cname.bv_len +
( sizeof("(=*)") - 1 );
- fstr->bv_val = ch_malloc( fstr->bv_len + 128 );
+ fstr->bv_val = op->o_tmpalloc( fstr->bv_len + 128, op->o_tmpmemctx );
snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s=*)",
vrf->vrf_sub_desc->ad_cname.bv_val );
@@ -1284,47 +1337,47 @@ simple_vrFilter2bv( ValuesReturnFilter *vrf, struct berval *fstr )
if ( vrf->vrf_sub_initial.bv_val != NULL ) {
len = fstr->bv_len;
- filter_escape_value( &vrf->vrf_sub_initial, &tmp );
+ filter_escape_value_x( &vrf->vrf_sub_initial, &tmp, op->o_tmpmemctx );
fstr->bv_len += tmp.bv_len;
- fstr->bv_val = ch_realloc( fstr->bv_val, fstr->bv_len + 1 );
+ fstr->bv_val = op->o_tmprealloc( fstr->bv_val, fstr->bv_len + 1, op->o_tmpmemctx );
snprintf( &fstr->bv_val[len-2], tmp.bv_len+3,
/* "(attr=" */ "%s*)",
tmp.bv_val );
- ber_memfree( tmp.bv_val );
+ ber_memfree_x( tmp.bv_val, op->o_tmpmemctx );
}
if ( vrf->vrf_sub_any != NULL ) {
int i;
for ( i = 0; vrf->vrf_sub_any[i].bv_val != NULL; i++ ) {
len = fstr->bv_len;
- filter_escape_value( &vrf->vrf_sub_any[i], &tmp );
+ filter_escape_value_x( &vrf->vrf_sub_any[i], &tmp, op->o_tmpmemctx );
fstr->bv_len += tmp.bv_len + 1;
- fstr->bv_val = ch_realloc( fstr->bv_val, fstr->bv_len + 1 );
+ fstr->bv_val = op->o_tmprealloc( fstr->bv_val, fstr->bv_len + 1, op->o_tmpmemctx );
snprintf( &fstr->bv_val[len-1], tmp.bv_len+3,
/* "(attr=[init]*[any*]" */ "%s*)",
tmp.bv_val );
- ber_memfree( tmp.bv_val );
+ ber_memfree_x( tmp.bv_val, op->o_tmpmemctx );
}
}
if ( vrf->vrf_sub_final.bv_val != NULL ) {
len = fstr->bv_len;
- filter_escape_value( &vrf->vrf_sub_final, &tmp );
+ filter_escape_value_x( &vrf->vrf_sub_final, &tmp, op->o_tmpmemctx );
fstr->bv_len += tmp.bv_len;
- fstr->bv_val = ch_realloc( fstr->bv_val, fstr->bv_len + 1 );
+ fstr->bv_val = op->o_tmprealloc( fstr->bv_val, fstr->bv_len + 1, op->o_tmpmemctx );
snprintf( &fstr->bv_val[len-1], tmp.bv_len+3,
/* "(attr=[init*][any*]" */ "%s)",
tmp.bv_val );
- ber_memfree( tmp.bv_val );
+ ber_memfree_x( tmp.bv_val, op->o_tmpmemctx );
}
break;
@@ -1332,7 +1385,7 @@ simple_vrFilter2bv( ValuesReturnFilter *vrf, struct berval *fstr )
case LDAP_FILTER_PRESENT:
fstr->bv_len = vrf->vrf_desc->ad_cname.bv_len +
( sizeof("(=*)") - 1 );
- fstr->bv_val = ch_malloc( fstr->bv_len + 1 );
+ fstr->bv_val = op->o_tmpalloc( fstr->bv_len + 1, op->o_tmpmemctx );
snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s=*)",
vrf->vrf_desc->ad_cname.bv_val );
@@ -1340,7 +1393,7 @@ simple_vrFilter2bv( ValuesReturnFilter *vrf, struct berval *fstr )
case LDAP_FILTER_EXT: {
struct berval ad;
- filter_escape_value( &vrf->vrf_mr_value, &tmp );
+ filter_escape_value_x( &vrf->vrf_mr_value, &tmp, op->o_tmpmemctx );
if ( vrf->vrf_mr_desc ) {
ad = vrf->vrf_mr_desc->ad_cname;
@@ -1353,7 +1406,7 @@ simple_vrFilter2bv( ValuesReturnFilter *vrf, struct berval *fstr )
( vrf->vrf_mr_dnattrs ? sizeof(":dn")-1 : 0 ) +
( vrf->vrf_mr_rule_text.bv_len ? vrf->vrf_mr_rule_text.bv_len+1 : 0 ) +
tmp.bv_len + ( sizeof("(:=)") - 1 );
- fstr->bv_val = ch_malloc( fstr->bv_len + 1 );
+ fstr->bv_val = op->o_tmpalloc( fstr->bv_len + 1, op->o_tmpmemctx );
snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s%s%s%s:=%s)",
ad.bv_val,
@@ -1362,11 +1415,11 @@ simple_vrFilter2bv( ValuesReturnFilter *vrf, struct berval *fstr )
vrf->vrf_mr_rule_text.bv_len ? vrf->vrf_mr_rule_text.bv_val : "",
tmp.bv_val );
- ber_memfree( tmp.bv_val );
+ ber_memfree_x( tmp.bv_val, op->o_tmpmemctx );
} break;
case SLAPD_FILTER_COMPUTED:
- ber_str2bv(
+ ber_str2bv_x(
vrf->vrf_result == LDAP_COMPARE_FALSE ? "(?=false)" :
vrf->vrf_result == LDAP_COMPARE_TRUE ? "(?=true)" :
vrf->vrf_result == SLAPD_COMPARE_UNDEFINED ? "(?=undefined)" :
@@ -1375,216 +1428,12 @@ simple_vrFilter2bv( ValuesReturnFilter *vrf, struct berval *fstr )
vrf->vrf_result == LDAP_COMPARE_TRUE ? sizeof("(?=true)")-1 :
vrf->vrf_result == SLAPD_COMPARE_UNDEFINED ? sizeof("(?=undefined)")-1 :
sizeof("(?=error)")-1,
- 1, fstr );
+ 1, fstr, op->o_tmpmemctx );
break;
default:
- ber_str2bv( "(?=unknown)", sizeof("(?=unknown)")-1, 1, fstr );
+ ber_str2bv_x( "(?=unknown)", sizeof("(?=unknown)")-1,
+ 1, fstr, op->o_tmpmemctx );
break;
}
}
-
-static int
-get_substring_vrFilter(
- Connection *conn,
- BerElement *ber,
- ValuesReturnFilter *vrf,
- const char **text )
-{
- ber_tag_t tag;
- ber_len_t len;
- ber_tag_t rc;
- struct berval value;
- char *last;
- struct berval bv;
- *text = "error decoding filter";
-
-#ifdef NEW_LOGGING
- LDAP_LOG( FILTER, ENTRY,
- "get_substring_filter: conn %d begin\n", conn->c_connid, 0, 0 );
-#else
- Debug( LDAP_DEBUG_FILTER, "begin get_substring_filter\n", 0, 0, 0 );
-#endif
- if ( ber_scanf( ber, "{m" /*}*/, &bv ) == LBER_ERROR ) {
- return SLAPD_DISCONNECT;
- }
-
- vrf->vrf_sub = ch_calloc( 1, sizeof(SubstringsAssertion) );
- vrf->vrf_sub_desc = NULL;
- rc = slap_bv2ad( &bv, &vrf->vrf_sub_desc, text );
-
- if( rc != LDAP_SUCCESS ) {
- text = NULL;
- ch_free( vrf->vrf_sub );
- vrf->vrf_choice = SLAPD_FILTER_COMPUTED;
- vrf->vrf_result = SLAPD_COMPARE_UNDEFINED;
- return LDAP_SUCCESS;
- }
-
- vrf->vrf_sub_initial.bv_val = NULL;
- vrf->vrf_sub_any = NULL;
- vrf->vrf_sub_final.bv_val = NULL;
-
- for ( tag = ber_first_element( ber, &len, &last ); tag != LBER_DEFAULT;
- tag = ber_next_element( ber, &len, last ) )
- {
- unsigned usage;
-
- rc = ber_scanf( ber, "m", &value );
- if ( rc == LBER_ERROR ) {
- rc = SLAPD_DISCONNECT;
- goto return_error;
- }
-
- if ( value.bv_val == NULL || value.bv_len == 0 ) {
- rc = LDAP_INVALID_SYNTAX;
- goto return_error;
- }
-
- switch ( tag ) {
- case LDAP_SUBSTRING_INITIAL:
- usage = SLAP_MR_SUBSTR_INITIAL;
- break;
-
- case LDAP_SUBSTRING_ANY:
- usage = SLAP_MR_SUBSTR_ANY;
- break;
-
- case LDAP_SUBSTRING_FINAL:
- usage = SLAP_MR_SUBSTR_FINAL;
- break;
-
- default:
- rc = LDAP_PROTOCOL_ERROR;
-
-#ifdef NEW_LOGGING
- LDAP_LOG( FILTER, ERR,
- "get_filter_substring: conn %d unknown substring choice=%ld\n",
- conn->c_connid, (long)tag, 0 );
-#else
- Debug( LDAP_DEBUG_FILTER,
- " unknown substring choice=%ld\n",
- (long) tag, 0, 0 );
-#endif
- goto return_error;
- }
-
-#ifdef SLAP_NVALUES
- /* validate/normalize using equality matching rule validator! */
- rc = asserted_value_validate_normalize(
- vrf->vrf_sub_desc, vrf->vrf_sub_desc->ad_type->sat_equality,
- usage, &value, &bv, text );
- if( rc != LDAP_SUCCESS ) {
- goto return_error;
- }
-#else
- /* valiate using equality matching rule validator! */
- rc = value_validate( vrf->vrf_sub_desc->ad_type->sat_equality,
- &value, text );
- if( rc != LDAP_SUCCESS ) {
- goto return_error;
- }
-
- rc = value_normalize( vrf->vrf_sub_desc, usage,
- &value, &bv, text );
- if( rc != LDAP_SUCCESS ) {
- goto return_error;
- }
-#endif
-
- value = bv;
-
- rc = LDAP_PROTOCOL_ERROR;
-
- switch ( tag ) {
- case LDAP_SUBSTRING_INITIAL:
-#ifdef NEW_LOGGING
- LDAP_LOG( FILTER, DETAIL1,
- "get_substring_filter: conn %d INITIAL\n",
- conn->c_connid, 0, 0 );
-#else
- Debug( LDAP_DEBUG_FILTER, " INITIAL\n", 0, 0, 0 );
-#endif
-
- if ( vrf->vrf_sub_initial.bv_val != NULL
- || vrf->vrf_sub_any != NULL
- || vrf->vrf_sub_final.bv_val != NULL )
- {
- free( value.bv_val );
- goto return_error;
- }
-
- vrf->vrf_sub_initial = value;
- break;
-
- case LDAP_SUBSTRING_ANY:
-#ifdef NEW_LOGGING
- LDAP_LOG( FILTER, DETAIL1,
- "get_substring_filter: conn %d ANY\n", conn->c_connid, 0, 0 );
-#else
- Debug( LDAP_DEBUG_FILTER, " ANY\n", 0, 0, 0 );
-#endif
-
- if ( vrf->vrf_sub_final.bv_val != NULL ) {
- free( value.bv_val );
- goto return_error;
- }
-
- ber_bvarray_add( &vrf->vrf_sub_any, &value );
- break;
-
- case LDAP_SUBSTRING_FINAL:
-#ifdef NEW_LOGGING
- LDAP_LOG( FILTER, DETAIL1,
- "get_substring_filter: conn %d FINAL\n", conn->c_connid, 0, 0 );
-#else
- Debug( LDAP_DEBUG_FILTER, " FINAL\n", 0, 0, 0 );
-#endif
-
- if ( vrf->vrf_sub_final.bv_val != NULL ) {
- free( value.bv_val );
- goto return_error;
- }
-
- vrf->vrf_sub_final = value;
- break;
-
- default:
-#ifdef NEW_LOGGING
- LDAP_LOG( FILTER, INFO,
- "get_substring_filter: conn %d unknown substring type %ld\n",
- conn->c_connid, (long)tag, 0 );
-#else
- Debug( LDAP_DEBUG_FILTER,
- " unknown substring type=%ld\n",
- (long) tag, 0, 0 );
-#endif
-
- free( value.bv_val );
-
-return_error:
-#ifdef NEW_LOGGING
- LDAP_LOG( FILTER, INFO,
- "get_substring_filter: conn %d error %ld\n",
- conn->c_connid, (long)rc, 0 );
-#else
- Debug( LDAP_DEBUG_FILTER, " error=%ld\n",
- (long) rc, 0, 0 );
-#endif
- free( vrf->vrf_sub_initial.bv_val );
- ber_bvarray_free( vrf->vrf_sub_any );
- free( vrf->vrf_sub_final.bv_val );
- ch_free( vrf->vrf_sub );
- return rc;
- }
- }
-
-#ifdef NEW_LOGGING
- LDAP_LOG( FILTER, ENTRY,
- "get_substring_filter: conn %d exit\n", conn->c_connid, 0, 0 );
-#else
- Debug( LDAP_DEBUG_FILTER, "end get_substring_filter\n", 0, 0, 0 );
-#endif
- return( LDAP_SUCCESS );
-}
-