servers/slapd/filter.c - diff

Return to filter.c CVS log

Up to [OpenLDAP] / servers / slapd

version 1.54, 2000/10/13 18:41:56	version 1.55, 2000/10/15 17:12:21
Line 1	Line 1
/* filter.c - routines for parsing and dealing with filters */	/* filter.c - routines for parsing and dealing with filters */
/* $OpenLDAP: pkg/ldap/servers/slapd/filter.c,v 1.53 2000/10/09 17:13:17 jsanchez Exp $ */	/* $OpenLDAP: pkg/ldap/servers/slapd/filter.c,v 1.54 2000/10/13 18:41:56 jsanchez Exp $ */
/*	/*
* Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.	* Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file	* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
Line 268 get_filter(	Line 268 get_filter(

*fstr = ch_malloc( sizeof("(:dn::=)")	*fstr = ch_malloc( sizeof("(:dn::=)")
+ (f->f_mr_desc ? f->f_mr_desc->ad_cname->bv_len : 0)	+ (f->f_mr_desc ? f->f_mr_desc->ad_cname->bv_len : 0)
+ (f->f_mr_rule ? strlen(f->f_mr_rule) : 0)	+ (f->f_mr_rule_text ? strlen(f->f_mr_rule_text) : 0)
+ escaped.bv_len );	+ escaped.bv_len );

sprintf( *fstr, "(%s%s%s%s:=%s)",	sprintf( *fstr, "(%s%s%s%s:=%s)",
(f->f_mr_desc ? f->f_mr_desc->ad_cname->bv_val : ""),	(f->f_mr_desc ? f->f_mr_desc->ad_cname->bv_val : ""),
(f->f_mr_dnattrs ? ":dn" : ""),	(f->f_mr_dnattrs ? ":dn" : ""),
(f->f_mr_rule ? ":" : ""),	(f->f_mr_rule_text ? ":" : ""),
(f->f_mr_rule ? f->f_mr_rule : ""),	(f->f_mr_rule_text ? f->f_mr_rule_text : ""),
f->f_mr_desc->ad_cname->bv_val,
escaped.bv_val );	escaped.bv_val );

ber_memfree( escaped.bv_val );	ber_memfree( escaped.bv_val );