Diff for /servers/slapd/filter.c between versions 1.125.2.11 and 1.125.2.12

version 1.125.2.11, 2007/10/05 06:25:15 version 1.125.2.12, 2007/10/05 06:36:24
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.125.2.10 2007/01/02 21:43:55 kurt Exp $ */  /* $OpenLDAP: pkg/ldap/servers/slapd/filter.c,v 1.125.2.11 2007/10/05 06:25:15 ando 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 546  filter2bv_x( Operation *op, Filter *f, s Line 546  filter2bv_x( Operation *op, Filter *f, s
         int             i;          int             i;
         Filter          *p;          Filter          *p;
         struct berval   tmp;          struct berval   tmp;
         char            uuid[ LDAP_LUTIL_UUIDSTR_BUFSIZE ];  
         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 564  filter2bv_x( Operation *op, Filter *f, s Line 563  filter2bv_x( Operation *op, Filter *f, s
         switch ( f->f_choice ) {          switch ( f->f_choice ) {
         case LDAP_FILTER_EQUALITY:          case LDAP_FILTER_EQUALITY:
                 if ( f->f_av_desc->ad_type->sat_syntax == slap_schema.si_ad_entryUUID->ad_type->sat_syntax ) {                  if ( f->f_av_desc->ad_type->sat_syntax == slap_schema.si_ad_entryUUID->ad_type->sat_syntax ) {
                           tmp.bv_val = op->o_tmpalloc( LDAP_LUTIL_UUIDSTR_BUFSIZE, op->o_tmpmemctx );
                         tmp.bv_len = lutil_uuidstr_from_normalized( f->f_av_value.bv_val,                          tmp.bv_len = lutil_uuidstr_from_normalized( f->f_av_value.bv_val,
                                 f->f_av_value.bv_len, uuid, LDAP_LUTIL_UUIDSTR_BUFSIZE );                                  f->f_av_value.bv_len, tmp.bv_val, LDAP_LUTIL_UUIDSTR_BUFSIZE );
                         assert( tmp.bv_len > 0 );                          assert( tmp.bv_len > 0 );
                         tmp.bv_val = uuid;  
                 } else {                  } else {
                         filter_escape_value_x( &f->f_av_value, &tmp, op->o_tmpmemctx );                          filter_escape_value_x( &f->f_av_value, &tmp, op->o_tmpmemctx );
                 }                  }

Removed from v.1.125.2.11  
changed lines
  Added in v.1.125.2.12


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