X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fstr2filter.c;h=504ee5f7431e7984f12bf4992abb6bb9ae931777;hb=6a9c44849c1c20b9d961de7a0b6585dcd059154a;hp=ba00cf0cabe8954836025974033d9bd1b01c60e4;hpb=4e15a84452f0493b1b5bc7b779c7bd1cd4fa4b73;p=openldap

diff --git a/servers/slapd/str2filter.c b/servers/slapd/str2filter.c
index ba00cf0cab..504ee5f743 100644
--- a/servers/slapd/str2filter.c
+++ b/servers/slapd/str2filter.c
@@ -1,8 +1,8 @@
-/* str2filter.c - parse an RFC 2554 string filter */
+/* str2filter.c - parse an RFC 4515 string filter */
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2003 The OpenLDAP Foundation.
+ * Copyright 1998-2007 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -33,14 +33,7 @@
 #include <ac/socket.h>
 
 #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_x( Operation *op, const char *str )
@@ -51,11 +44,7 @@ str2filter_x( Operation *op, const char *str )
 	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;
@@ -85,7 +74,9 @@ Filter *
 str2filter( const char *str )
 {
 	Operation op = {0};
+	Opheader ohdr = {0};
 
+	op.o_hdr = &ohdr;
 	op.o_tmpmemctx = NULL;
 	op.o_tmpmfuncs = &ch_mfuncs;