/* str2filter.c - parse an rfc 1588 string filter */
/* $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
*/
#include "slap.h"
#include <ldap_pvt.h>
+#if 0 /* unused */
static char *find_matching_paren( const char *s );
+#endif /* unused */
static Filter *str2list( const char *str, long unsigned int ftype);
static Filter *str2simple( const char *str);
static int str2subvals( const char *val, Filter *f);
Filter *
-str2filter( const char *str )
+str2filter_x( Operation *op, const char *str )
{
int rc;
Filter *f = NULL;
- BerElement *ber;
- char berbuf[256];
- struct berval *bv = NULL;
- Connection conn;
+ BerElementBuffer berbuf;
+ BerElement *ber = (BerElement *)&berbuf;
const char *text = NULL;
#ifdef NEW_LOGGING
return NULL;
}
- ber = ber_alloc_t( LBER_USE_DER );
- if( ber == NULL ) {
- return NULL;
+ ber_init2( ber, NULL, LBER_USE_DER );
+ if ( op->o_tmpmemctx ) {
+ ber_set_option( ber, LBER_OPT_BER_MEMCTX, &op->o_tmpmemctx );
}
rc = ldap_pvt_put_filter( ber, str );
goto done;
}
- rc = ber_flatten( ber, &bv );
- if( rc < 0 ) {
- goto done;
- }
+ ber_reset( ber, 1 );
- ber_free( ber, 0 );
+ rc = get_filter( op, ber, &f, &text );
- ber = (BerElement *)berbuf;
- ber_init2( ber, bv, 0 );
+done:
+ ber_free_buf( ber );
- conn.c_connid = 0;
+ return f;
+}
- rc = get_filter( &conn, ber, &f, &text );
- if( rc ) {
- goto done;
- }
+Filter *
+str2filter( const char *str )
+{
+ Operation op = {0};
-done:
- ber_bvfree( bv );
+ op.o_tmpmemctx = NULL;
+ op.o_tmpmfuncs = &ch_mfuncs;
- return f;
+ return str2filter_x( &op, str );
}