--- servers/slapd/filter.c 2003/04/29 18:40:26 1.115 +++ servers/slapd/filter.c 2003/12/01 00:58:34 1.115.2.2 @@ -1,8 +1,27 @@ /* filter.c - routines for parsing and dealing with filters */ -/* $OpenLDAP: pkg/ldap/servers/slapd/filter.c,v 1.114 2003/04/29 18:12:00 hallvard Exp $ */ -/* - * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved. - * COPYING RESTRICTIONS APPLY, see COPYRIGHT file +/* $OpenLDAP: pkg/ldap/servers/slapd/filter.c,v 1.115.2.1 2003/10/06 14:57:29 kurt Exp $ */ +/* This work is part of OpenLDAP Software . + * + * Copyright 1998-2003 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 + * . + */ +/* 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" @@ -26,6 +45,11 @@ static int get_ssa( SubstringsAssertion **s, const char **text ); +static int filter_escape_value_x( + struct berval *in, + struct berval *out, + void *ctx ); + static void simple_vrFilter2bv( Operation *op, ValuesReturnFilter *f, @@ -854,7 +878,7 @@ filter2bv( Filter *f, struct berval *fst filter2bv_x( &op, f, fstr ); } -int +static int filter_escape_value_x( struct berval *in, struct berval *out,