Diff for /servers/slapd/back-bdb/dn2id.c between versions 1.125 and 1.126

version 1.125, 2005/07/30 21:42:41 version 1.126, 2005/09/13 05:55:01
Line 1 Line 1
 /* dn2id.c - routines to deal with the dn2id index */  /* dn2id.c - routines to deal with the dn2id index */
 /* $OpenLDAP: pkg/ldap/servers/slapd/back-bdb/dn2id.c,v 1.124 2005/07/30 21:39:44 hallvard Exp $ */  /* $OpenLDAP: pkg/ldap/servers/slapd/back-bdb/dn2id.c,v 1.125 2005/07/30 21:42:41 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 2000-2005 The OpenLDAP Foundation.   * Copyright 2000-2005 The OpenLDAP Foundation.
Line 953  hdb_dn2idl_internal( Line 953  hdb_dn2idl_internal(
 saveit:  saveit:
         if ( cx->bdb->bi_idl_cache_max_size ) {          if ( cx->bdb->bi_idl_cache_max_size ) {
                 cx->key.data = &cx->id;                  cx->key.data = &cx->id;
                   if ( !BDB_IDL_IS_RANGE( cx->tmp ) && cx->tmp[0] > 1 )
                           bdb_idl_sort( cx->tmp );
                 bdb_idl_cache_put( cx->bdb, cx->db, &cx->key, cx->tmp, cx->rc );                  bdb_idl_cache_put( cx->bdb, cx->db, &cx->key, cx->tmp, cx->rc );
         }          }
         ;          ;
 gotit:  gotit:
         if ( !BDB_IDL_IS_ZERO( cx->tmp )) {          if ( !BDB_IDL_IS_ZERO( cx->tmp )) {
                 if ( cx->prefix == DN_SUBTREE_PREFIX ) {                  if ( cx->prefix == DN_SUBTREE_PREFIX ) {
                         bdb_idl_append( cx->ids, cx->tmp );                          bdb_idl_merge( cx->ids, cx->tmp );
                         if ( !(cx->ei->bei_state & CACHE_ENTRY_NO_GRANDKIDS)) {                          if ( !(cx->ei->bei_state & CACHE_ENTRY_NO_GRANDKIDS)) {
                                 ID *save, idcurs;                                  ID *save, idcurs;
                                 EntryInfo *ei = cx->ei;                                  EntryInfo *ei = cx->ei;
Line 1038  hdb_dn2idl( Line 1040  hdb_dn2idl(
         DBTzero(&cx.data);          DBTzero(&cx.data);
   
         hdb_dn2idl_internal(&cx);          hdb_dn2idl_internal(&cx);
         if ( !BDB_IDL_IS_ZERO( ids ) && !BDB_IDL_IS_RANGE( ids ))  
                 bdb_idl_sort( ids );  
   
         return cx.rc;          return cx.rc;
 }  }

Removed from v.1.125  
changed lines
  Added in v.1.126


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