Diff for /servers/slapd/component.c between versions 1.13.2.4 and 1.13.2.5

version 1.13.2.4, 2005/07/11 05:55:29 version 1.13.2.5, 2005/08/09 21:03:58
Line 1 Line 1
 /* component.c -- Component Filter Match Routines */  /* component.c -- Component Filter Match Routines */
 /* $OpenLDAP: pkg/ldap/servers/slapd/component.c,v 1.25 2005/07/04 03:29:12 hallvard Exp $ */  /* $OpenLDAP: pkg/ldap/servers/slapd/component.c,v 1.27 2005/07/18 03:11:11 hallvard Exp $ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.  /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *   *
  * Copyright 2003-2005 The OpenLDAP Foundation.   * Copyright 2003-2005 The OpenLDAP Foundation.
Line 99  componentFilterMatch ( Line 99  componentFilterMatch (
 {  {
         ComponentSyntaxInfo *csi_attr = (ComponentSyntaxInfo*)value;          ComponentSyntaxInfo *csi_attr = (ComponentSyntaxInfo*)value;
         MatchingRuleAssertion * ma = (MatchingRuleAssertion*)assertedValue;          MatchingRuleAssertion * ma = (MatchingRuleAssertion*)assertedValue;
         int num_attr, rc, i;          int rc;
   
         if ( !mr || !ma->ma_cf ) return LDAP_INAPPROPRIATE_MATCHING;          if ( !mr || !ma->ma_cf ) return LDAP_INAPPROPRIATE_MATCHING;
   
Line 154  allComponentsMatch( Line 154  allComponentsMatch(
 static int  static int
 slapd_ber2cav( struct berval* bv, ComponentAssertionValue* cav )  slapd_ber2cav( struct berval* bv, ComponentAssertionValue* cav )
 {  {
         int len;  
   
         cav->cav_ptr = cav->cav_buf = bv->bv_val;          cav->cav_ptr = cav->cav_buf = bv->bv_val;
         cav->cav_end = bv->bv_val + bv->bv_len;          cav->cav_end = bv->bv_val + bv->bv_len;
   
Line 165  slapd_ber2cav( struct berval* bv, Compon Line 163  slapd_ber2cav( struct berval* bv, Compon
 ComponentReference*  ComponentReference*
 dup_comp_ref ( Operation* op, ComponentReference* cr )  dup_comp_ref ( Operation* op, ComponentReference* cr )
 {  {
         int rc, count = 0;  
         ComponentReference* dup_cr;          ComponentReference* dup_cr;
         ComponentId* ci_curr;          ComponentId* ci_curr;
         ComponentId** ci_temp;          ComponentId** ci_temp;
         ber_int_t type;  
   
         dup_cr = op->o_tmpalloc( sizeof( ComponentReference ), op->o_tmpmemctx );          dup_cr = op->o_tmpalloc( sizeof( ComponentReference ), op->o_tmpmemctx );
   
Line 234  dup_comp_filter_item ( Line 230  dup_comp_filter_item (
         ComponentAssertion* in_ca,          ComponentAssertion* in_ca,
         ComponentAssertion** out_ca )          ComponentAssertion** out_ca )
 {  {
         ComponentAssertion* ca;  
         int len;          int len;
   
         if ( !in_ca->ca_comp_ref ) return SLAPD_DISCONNECT;          if ( !in_ca->ca_comp_ref ) return SLAPD_DISCONNECT;
Line 301  dup_comp_filter ( Line 296  dup_comp_filter (
 int  int
 get_aliased_filter_aa ( Operation* op, AttributeAssertion* a_assert, AttributeAliasing* aa, const char** text )  get_aliased_filter_aa ( Operation* op, AttributeAssertion* a_assert, AttributeAliasing* aa, const char** text )
 {  {
         int rc;  
         struct berval assert_bv;          struct berval assert_bv;
         ComponentAssertion* ca;  
   
         Debug( LDAP_DEBUG_FILTER, "get_aliased_filter\n", 0, 0, 0 );          Debug( LDAP_DEBUG_FILTER, "get_aliased_filter\n", 0, 0, 0 );
   
Line 324  get_aliased_filter( Operation* op, Line 317  get_aliased_filter( Operation* op,
         MatchingRuleAssertion* ma, AttributeAliasing* aa,          MatchingRuleAssertion* ma, AttributeAliasing* aa,
         const char** text )          const char** text )
 {  {
         int rc;  
         struct berval assert_bv;          struct berval assert_bv;
         ComponentAssertion* ca;  
   
         Debug( LDAP_DEBUG_FILTER, "get_aliased_filter\n", 0, 0, 0 );          Debug( LDAP_DEBUG_FILTER, "get_aliased_filter\n", 0, 0, 0 );
   
Line 911  strip_cav_str( ComponentAssertionValue* Line 902  strip_cav_str( ComponentAssertionValue*
 /*  /*
  * TAG : "item", "and", "or", "not"   * TAG : "item", "and", "or", "not"
  */   */
 static int  static ber_tag_t
 strip_cav_tag( ComponentAssertionValue* cav )  strip_cav_tag( ComponentAssertionValue* cav )
 {  {
   
Line 956  get_item( Operation *op, ComponentAssert Line 947  get_item( Operation *op, ComponentAssert
 {  {
         int rc;          int rc;
         ComponentAssertion* _ca;          ComponentAssertion* _ca;
         struct berval t_bv;  
         struct berval value;          struct berval value;
         MatchingRule* mr;          MatchingRule* mr;
   
Line 1268  test_comp_filter_item( Line 1258  test_comp_filter_item(
         ComponentSyntaxInfo *csi_attr,          ComponentSyntaxInfo *csi_attr,
         ComponentAssertion *ca )          ComponentAssertion *ca )
 {  {
         int rc, len;          int rc;
         void *attr_nm, *assert_nm;          void *attr_nm, *assert_nm;
   
         if ( strcmp(ca->ca_ma_rule->smr_mrule.mr_oid,          if ( strcmp(ca->ca_ma_rule->smr_mrule.mr_oid,

Removed from v.1.13.2.4  
changed lines
  Added in v.1.13.2.5


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