resync with HEAD

[openldap] / servers / slapd / str2filter.c

diff --git a/servers/slapd/str2filter.c b/servers/slapd/str2filter.c
index 710bd13b10a49e718ed6ad762e7b32009c8f5abf..374ec60b2f45b3e14544fd35a85bf224b49a769d 100644 (file)
--- 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 2554 string filter */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 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-2005 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,29 +33,18 @@
 #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 )
 {
        int rc;
        Filter  *f = NULL;
-       char berbuf[LBER_ELEMENT_SIZEOF];
-       BerElement *ber = (BerElement *)berbuf;
+       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;
@@ -44,7 +52,7 @@ str2filter_x( Operation *op, const char *str )
 
        ber_init2( ber, NULL, LBER_USE_DER );
        if ( op->o_tmpmemctx ) {
-               ber_set_option( ber, LBER_OPT_BER_MEMCTX, op->o_tmpmemctx );
+               ber_set_option( ber, LBER_OPT_BER_MEMCTX, &op->o_tmpmemctx );
        }
 
        rc = ldap_pvt_put_filter( ber, str );
@@ -66,10 +74,11 @@ Filter *
 str2filter( const char *str )
 {
        Operation op = {0};
+       Opheader ohdr = {0};
 
+       op.o_hdr = &ohdr;
        op.o_tmpmemctx = NULL;
-       op.o_tmpalloc = ch_malloc;
-       op.o_tmpfree = ch_free;
+       op.o_tmpmfuncs = &ch_mfuncs;
 
        return str2filter_x( &op, str );
 }