X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fstr2filter.c;h=0c593f69b87dc0ad8031e4b2566655aae39fa4df;hb=0121f8c01dcdef0827c8e6a1770d0a5ae3b0806e;hp=ff7cd450adfc7eea72d5e479af5fd74831697131;hpb=6107ba67d2fd7eadb23ffdd1d284306011ef4013;p=openldap

diff --git a/servers/slapd/str2filter.c b/servers/slapd/str2filter.c
index ff7cd450ad..0c593f69b8 100644
--- a/servers/slapd/str2filter.c
+++ b/servers/slapd/str2filter.c
@@ -1,8 +1,27 @@
-/* str2filter.c - parse an rfc 1588 string filter */
+/* str2filter.c - parse an RFC 4515 string filter */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2002 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-2009 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.
  */
 
 #include "portable.h"
@@ -14,37 +33,26 @@
 #include <ac/socket.h>
 
 #include "slap.h"
-#include <ldap_pvt.h>
 
-static char	*find_matching_paren( const char *s );
-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
-	LDAP_LOG( FILTER, ENTRY,  "str2filter: \"%s\"\n", str, 0, 0 );
-#else
 	Debug( LDAP_DEBUG_FILTER, "str2filter \"%s\"\n", str, 0, 0 );
-#endif
 
 	if ( str == NULL || *str == '\0' ) {
 		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 );
@@ -52,25 +60,25 @@ str2filter( const char *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};
+	Opheader ohdr = {0};
 
-done:
-	ber_bvfree( bv );
+	op.o_hdr = &ohdr;
+	op.o_tmpmemctx = NULL;
+	op.o_tmpmfuncs = &ch_mfuncs;
 
-	return f;
+	return str2filter_x( &op, str );
 }