Diff for /servers/slapd/filter.c between versions 1.32 and 1.34

version 1.32, 2000/05/16 14:22:52 version 1.34, 2000/05/16 19:03:18
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.31 2000/05/15 21:47:51 kurt Exp $ */  /* $OpenLDAP: pkg/ldap/servers/slapd/filter.c,v 1.33 2000/05/16 18:50:49 kurt 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 94  get_filter( Line 94  get_filter(
         case LDAP_FILTER_EQUALITY:          case LDAP_FILTER_EQUALITY:
                 Debug( LDAP_DEBUG_FILTER, "EQUALITY\n", 0, 0, 0 );                  Debug( LDAP_DEBUG_FILTER, "EQUALITY\n", 0, 0, 0 );
   
                 if ( (err = get_ava( ber, &f->f_ava )) != LDAP_SUCCESS ) {                  if ( (err = get_ava( ber, &f->f_ava, text )) != LDAP_SUCCESS ) {
                         *text = "error decoding filter";  
                         break;                          break;
                 }                  }
   
                   assert( f->f_ava != NULL );
   
 #ifdef SLAPD_SCHEMA_NOT_COMPAT  #ifdef SLAPD_SCHEMA_NOT_COMPAT
                 *fstr = ch_malloc( sizeof("(=)")                  *fstr = ch_malloc( sizeof("(=)")
                         + f->f_av_desc->ad_cname->bv_len                          + f->f_av_desc->ad_cname->bv_len
Line 125  get_filter( Line 126  get_filter(
         case LDAP_FILTER_GE:          case LDAP_FILTER_GE:
                 Debug( LDAP_DEBUG_FILTER, "GE\n", 0, 0, 0 );                  Debug( LDAP_DEBUG_FILTER, "GE\n", 0, 0, 0 );
   
                 if ( (err = get_ava( ber, &f->f_ava )) != LDAP_SUCCESS ) {                  if ( (err = get_ava( ber, &f->f_ava, text )) != LDAP_SUCCESS ) {
                         *text = "decoding filter error";  
                         break;                          break;
                 }                  }
   
Line 151  get_filter( Line 151  get_filter(
         case LDAP_FILTER_LE:          case LDAP_FILTER_LE:
                 Debug( LDAP_DEBUG_FILTER, "LE\n", 0, 0, 0 );                  Debug( LDAP_DEBUG_FILTER, "LE\n", 0, 0, 0 );
   
                 if ( (err = get_ava( ber, &f->f_ava )) != LDAP_SUCCESS ) {                  if ( (err = get_ava( ber, &f->f_ava, text )) != LDAP_SUCCESS ) {
                         *text = "decoding filter error";  
                         break;                          break;
                 }                  }
   
Line 218  get_filter( Line 217  get_filter(
         case LDAP_FILTER_APPROX:          case LDAP_FILTER_APPROX:
                 Debug( LDAP_DEBUG_FILTER, "APPROX\n", 0, 0, 0 );                  Debug( LDAP_DEBUG_FILTER, "APPROX\n", 0, 0, 0 );
   
                 if ( (err = get_ava( ber, &f->f_ava )) != LDAP_SUCCESS ) {                  if ( (err = get_ava( ber, &f->f_ava, text )) != LDAP_SUCCESS ) {
                         *text = "decoding filter error";  
                         break;                          break;
                 }                  }
   

Removed from v.1.32  
changed lines
  Added in v.1.34


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