Diff for /servers/slapd/filter.c between versions 1.142 and 1.147

version 1.142, 2007/09/15 15:38:53 version 1.147, 2007/11/09 06:28:42
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.141 2007/02/20 22:08:09 ando Exp $ */  /* $OpenLDAP: pkg/ldap/servers/slapd/filter.c,v 1.146 2007/11/07 03:02:21 hyc Exp $ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.  /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *   *
  * Copyright 1998-2007 The OpenLDAP Foundation.   * Copyright 1998-2007 The OpenLDAP Foundation.
Line 32 Line 32
 #include <ac/string.h>  #include <ac/string.h>
   
 #include "slap.h"  #include "slap.h"
   #include "lutil.h"
   
 const Filter *slap_filter_objectClass_pres;  const Filter *slap_filter_objectClass_pres;
 const struct berval *slap_filterstr_objectClass_pres;  const struct berval *slap_filterstr_objectClass_pres;
Line 566  filter2bv_x( Operation *op, Filter *f, s Line 567  filter2bv_x( Operation *op, Filter *f, s
 {  {
         int             i;          int             i;
         Filter          *p;          Filter          *p;
         struct berval   tmp;          struct berval   tmp, value;
         static struct berval          static struct berval
                         ber_bvfalse = BER_BVC( "(?=false)" ),                          ber_bvfalse = BER_BVC( "(?=false)" ),
                         ber_bvtrue = BER_BVC( "(?=true)" ),                          ber_bvtrue = BER_BVC( "(?=true)" ),
Line 605  filter2bv_x( Operation *op, Filter *f, s Line 606  filter2bv_x( Operation *op, Filter *f, s
                 sign = "~=";                  sign = "~=";
   
 simple:  simple:
                 filter_escape_value_x( &f->f_av_value, &tmp, op->o_tmpmemctx );                  value = f->f_av_value;
                   if ( f->f_av_desc->ad_type->sat_equality &&
                           ( f->f_av_desc->ad_type->sat_equality->smr_usage & SLAP_MR_MUTATION_NORMALIZER )) {
                           f->f_av_desc->ad_type->sat_equality->smr_normalize(
                                   (SLAP_MR_DENORMALIZE|SLAP_MR_VALUE_OF_ASSERTION_SYNTAX),
                                   NULL, NULL, &f->f_av_value, &value, op->o_tmpmemctx );
                   }
   
                   filter_escape_value_x( &value, &tmp, op->o_tmpmemctx );
                 /* NOTE: tmp can legitimately be NULL (meaning empty)                   /* NOTE: tmp can legitimately be NULL (meaning empty) 
                  * since in a Filter values in AVAs are supposed                   * since in a Filter values in AVAs are supposed
                  * to have been normalized, meaning that an empty value                   * to have been normalized, meaning that an empty value
Line 621  simple: Line 630  simple:
                         f->f_av_desc->ad_cname.bv_val, sign,                          f->f_av_desc->ad_cname.bv_val, sign,
                         tmp.bv_len ? tmp.bv_val : "" );                          tmp.bv_len ? tmp.bv_val : "" );
   
                   if ( value.bv_val != f->f_av_value.bv_val ) {
                           ber_memfree_x( value.bv_val, op->o_tmpmemctx );
                   }
   
                 ber_memfree_x( tmp.bv_val, op->o_tmpmemctx );                  ber_memfree_x( tmp.bv_val, op->o_tmpmemctx );
                 break;                  break;
   

Removed from v.1.142  
changed lines
  Added in v.1.147


______________
© Copyright 1998-2020, OpenLDAP Foundation, info@OpenLDAP.org