check consistency of referrals and result code (ITS#4861)

[openldap] / servers / slapd / str2filter.c

diff --git a/servers/slapd/str2filter.c b/servers/slapd/str2filter.c
index 39fa95eaecda42e23ba33b01a6fb9c0b8d8aeba5..504ee5f7431e7984f12bf4992abb6bb9ae931777 100644 (file)
--- 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-2004 The OpenLDAP Foundation.
+ * Copyright 1998-2007 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -34,12 +34,6 @@
 
 #include "slap.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 )
@@ -80,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;