Diff for /servers/slapd/filter.c between versions 1.134.2.16 and 1.134.2.17

version 1.134.2.16, 2009/01/22 00:01:01 version 1.134.2.17, 2009/08/13 00:48:32
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.15 2008/11/11 19:30:37 quanah Exp $ */  /* $OpenLDAP: pkg/ldap/servers/slapd/filter.c,v 1.134.2.16 2009/01/22 00:01:01 kurt 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-2009 The OpenLDAP Foundation.   * Copyright 1998-2009 The OpenLDAP Foundation.
Line 348  get_ssa( Line 348  get_ssa(
 {  {
         ber_tag_t       tag;          ber_tag_t       tag;
         ber_len_t       len;          ber_len_t       len;
         ber_tag_t       rc;          int     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 ) {          if ( ssa.sa_desc->ad_type->sat_substr == NULL ) {
                 for ( tag = ber_first_element( ber, &len, &last );                  f->f_choice |= SLAPD_FILTER_UNDEFINED;
                         tag != LBER_DEFAULT;                  Debug( LDAP_DEBUG_FILTER,
                         tag = ber_next_element( ber, &len, last ) )                  "get_ssa: no substring matching rule for attributeType %s\n",
                 {                          desc.bv_val, 0, 0 );
                         /* eat all */  
                         rc = ber_scanf( ber, "x" );  
                 }  
   
                 rc = LDAP_INVALID_SYNTAX;  
                 goto return_error;  
         }          }
   
         for ( tag = ber_first_element( ber, &len, &last );          for ( tag = ber_first_element( ber, &len, &last );
Line 457  get_ssa( Line 455  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 ) goto return_error;                  if( rc != LDAP_SUCCESS ) {
                           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:

Removed from v.1.134.2.16  
changed lines
  Added in v.1.134.2.17


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