X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fstr2filter.c;h=b6aa778c6b85fd71bd1567eeb4d47b7555d596bd;hb=d520cd607d452fe4809d86f37b299ee7665d0f12;hp=4ce084aad5d52477094cdaac1a35a6f4714345b9;hpb=3c598e89fb34a892d369a138daa8c3314294493c;p=openldap

diff --git a/servers/slapd/str2filter.c b/servers/slapd/str2filter.c
index 4ce084aad5..b6aa778c6b 100644
--- a/servers/slapd/str2filter.c
+++ b/servers/slapd/str2filter.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2004 The OpenLDAP Foundation.
+ * Copyright 1998-2005 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -33,7 +33,6 @@
 #include <ac/socket.h>
 
 #include "slap.h"
-#include <ldap_pvt.h>
 
 #if 0 /* unused */
 static char	*find_matching_paren( const char *s );
@@ -51,11 +50,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 +80,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;