Diff for /servers/slapd/filter.c between versions 1.134.2.20 and 1.151

version 1.134.2.20, 2011/01/04 23:50:20 version 1.151, 2008/10/09 20:34:43
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.134.2.19 2011/01/03 18:53:47 quanah Exp $ */  /* $OpenLDAP: pkg/ldap/servers/slapd/filter.c,v 1.150 2008/09/05 22:00:37 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-2011 The OpenLDAP Foundation.   * Copyright 1998-2008 The OpenLDAP Foundation.
  * All rights reserved.   * All rights reserved.
  *   *
  * Redistribution and use in source and binary forms, with or without   * Redistribution and use in source and binary forms, with or without
Line 348  get_ssa( Line 348  get_ssa(
 {  {
         ber_tag_t       tag;          ber_tag_t       tag;
         ber_len_t       len;          ber_len_t       len;
         int     rc;          ber_tag_t       rc;
         struct berval desc, value, nvalue;          struct berval desc, value, nvalue;
         char            *last;          char            *last;
         SubstringsAssertion ssa;          SubstringsAssertion ssa;
Line 385  get_ssa( Line 385  get_ssa(
   
         rc = LDAP_PROTOCOL_ERROR;          rc = LDAP_PROTOCOL_ERROR;
   
         /* If there is no substring matching rule, there's nothing  
          * we can do with this filter. But we continue to parse it  
          * for logging purposes.  
          */  
         if ( ssa.sa_desc->ad_type->sat_substr == NULL ) {  
                 f->f_choice |= SLAPD_FILTER_UNDEFINED;  
                 Debug( LDAP_DEBUG_FILTER,  
                 "get_ssa: no substring matching rule for attributeType %s\n",  
                         desc.bv_val, 0, 0 );  
         }  
   
         for ( tag = ber_first_element( ber, &len, &last );          for ( tag = ber_first_element( ber, &len, &last );
                 tag != LBER_DEFAULT;                  tag != LBER_DEFAULT;
                 tag = ber_next_element( ber, &len, last ) )                  tag = ber_next_element( ber, &len, last ) )
Line 455  get_ssa( Line 444  get_ssa(
                 rc = asserted_value_validate_normalize(                  rc = asserted_value_validate_normalize(
                         ssa.sa_desc, ssa.sa_desc->ad_type->sat_equality,                          ssa.sa_desc, ssa.sa_desc->ad_type->sat_equality,
                         usage, &value, &nvalue, text, op->o_tmpmemctx );                          usage, &value, &nvalue, text, op->o_tmpmemctx );
                 if( rc != LDAP_SUCCESS ) {                  if( rc != LDAP_SUCCESS ) goto return_error;
                         f->f_choice |= SLAPD_FILTER_UNDEFINED;  
                         Debug( LDAP_DEBUG_FILTER,  
                         "get_ssa: illegal value for attributeType %s (%d) %s\n",  
                                 desc.bv_val, rc, *text );  
                         ber_dupbv_x( &nvalue, &value, op->o_tmpmemctx );  
                 }  
   
                 switch ( tag ) {                  switch ( tag ) {
                 case LDAP_SUBSTRING_INITIAL:                  case LDAP_SUBSTRING_INITIAL:
Line 521  filter_free_x( Operation *op, Filter *f, Line 504  filter_free_x( Operation *op, Filter *f,
   
         switch ( f->f_choice ) {          switch ( f->f_choice ) {
         case LDAP_FILTER_PRESENT:          case LDAP_FILTER_PRESENT:
                 if ( f->f_desc->ad_flags & SLAP_DESC_TEMPORARY )  
                         op->o_tmpfree( f->f_desc, op->o_tmpmemctx );  
                 break;                  break;
   
         case LDAP_FILTER_EQUALITY:          case LDAP_FILTER_EQUALITY:

Removed from v.1.134.2.20  
changed lines
  Added in v.1.151


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