Diff for /servers/slapd/filter.c between versions 1.113 and 1.115.2.2

version 1.113, 2003/04/29 16:13:10 version 1.115.2.2, 2003/12/01 00:58:34
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.112 2003/04/29 03:58:28 hyc Exp $ */  /* $OpenLDAP: pkg/ldap/servers/slapd/filter.c,v 1.115.2.1 2003/10/06 14:57:29 kurt Exp $ */
 /*  /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.   *
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file   * Copyright 1998-2003 The OpenLDAP Foundation.
    * All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted only as authorized by the OpenLDAP
    * Public License.
    *
    * A copy of this license is available in the file LICENSE in the
    * top-level directory of the distribution or, alternatively, at
    * <http://www.OpenLDAP.org/license.html>.
    */
   /* Portions Copyright (c) 1995 Regents of the University of Michigan.
    * All rights reserved.
    *
    * Redistribution and use in source and binary forms are permitted
    * provided that this notice is preserved and that due credit is given
    * to the University of Michigan at Ann Arbor. The name of the University
    * may not be used to endorse or promote products derived from this
    * software without specific prior written permission. This software
    * is provided ``as is'' without express or implied warranty.
  */   */
   
 #include "portable.h"  #include "portable.h"
Line 26  static int get_ssa( Line 45  static int get_ssa(
         SubstringsAssertion **s,          SubstringsAssertion **s,
         const char **text );          const char **text );
   
   static int filter_escape_value_x(
           struct berval *in,
           struct berval *out,
           void *ctx );
   
 static void simple_vrFilter2bv(  static void simple_vrFilter2bv(
         Operation *op,          Operation *op,
         ValuesReturnFilter *f,          ValuesReturnFilter *f,
Line 252  get_filter( Line 276  get_filter(
   
                 assert( f.f_not != NULL );                  assert( f.f_not != NULL );
                 if ( f.f_not->f_choice == SLAPD_FILTER_COMPUTED ) {                  if ( f.f_not->f_choice == SLAPD_FILTER_COMPUTED ) {
                           int fresult = f.f_not->f_result;
                         f.f_choice = SLAPD_FILTER_COMPUTED;                          f.f_choice = SLAPD_FILTER_COMPUTED;
                         f.f_result = f.f_not->f_result;  
                         op->o_tmpfree( f.f_not, op->o_tmpmemctx );                          op->o_tmpfree( f.f_not, op->o_tmpmemctx );
                         f.f_not = NULL;                          f.f_not = NULL;
   
                         switch( f.f_result ) {                          switch( fresult ) {
                         case LDAP_COMPARE_TRUE:                          case LDAP_COMPARE_TRUE:
                                 f.f_result = LDAP_COMPARE_FALSE;                                  f.f_result = LDAP_COMPARE_FALSE;
                                 break;                                  break;
                         case LDAP_COMPARE_FALSE:                          case LDAP_COMPARE_FALSE:
                                 f.f_result = LDAP_COMPARE_TRUE;                                  f.f_result = LDAP_COMPARE_TRUE;
                                 break;                                  break;
                         default:                          default: ;
                                 /* (!Undefined) is Undefined */                                  /* (!Undefined) is Undefined */
                         }                          }
                 }                  }
Line 854  filter2bv( Filter *f, struct berval *fst Line 878  filter2bv( Filter *f, struct berval *fst
         filter2bv_x( &op, f, fstr );          filter2bv_x( &op, f, fstr );
 }  }
   
 int  static int
 filter_escape_value_x(  filter_escape_value_x(
         struct berval *in,          struct berval *in,
         struct berval *out,          struct berval *out,

Removed from v.1.113  
changed lines
  Added in v.1.115.2.2


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