[389-commits] ldap/servers

[Noriko Hosoi]

 ldap/servers/slapd/back-ldbm/ldif2ldbm.c |   12 ------------
 1 file changed, 12 deletions(-)

New commits:
commit 573b529b3c44084cfa8b4659b803f8fc596021f1
Author: Noriko Hosoi <nhosoi at redhat.com>
Date:   Fri Jan 7 13:21:33 2011 -0800

    Bug 667488 - Cannot recreate numsubordinates index with db2index
    
    https://bugzilla.redhat.com/show_bug.cgi?id=667488
    
    Description: Special thanks to Orion Poplawski(orion at cora.nwra.com)
    for his in-depth analysis on the bug.  As he figured out, a helper
    function add_op_attrs called from the reindex API ldbm_back_ldbm2index
    removes the numsubordinates attribute-value pair from entries to
    be reindexed, which makes reindexing numsubordinates fail.
    
    The helper function add_op_attrs adds operational attributes parentid,
    entryid and entrydn to entries as well as removes numsubordinates
    from them before the entries are reindexed/imported. The add and
    remove are necessary for the import, but not for the reindex since
    these to-be-added operational attributes are already in entries
    in the primary database id2entry.  And numsubordinates is necessary
    when the attribute is reindexed.
    
    This patch updates ldbm_back_ldbm2index (ldif2ldbm.c) not to call
    add_op_attrs.

diff --git a/ldap/servers/slapd/back-ldbm/ldif2ldbm.c b/ldap/servers/slapd/back-ldbm/ldif2ldbm.c
index 4f8e198..a89f5e9 100644
--- a/ldap/servers/slapd/back-ldbm/ldif2ldbm.c
+++ b/ldap/servers/slapd/back-ldbm/ldif2ldbm.c
@@ -2110,18 +2110,6 @@ ldbm_back_ldbm2index(Slapi_PBlock *pb)
             continue;
         }
 
-        if ( add_op_attrs( pb, li, ep, NULL ) != 0 ) {
-            if (task) {
-                slapi_task_log_notice(task,
-                    "%s: ERROR: Could not add op attrs to entry (id %lu)",
-                    inst->inst_name, (u_long)ep->ep_id);
-            }
-            LDAPDebug(LDAP_DEBUG_ANY,
-                "%s: ERROR: Could not add op attrs to entry (id %lu)\n",
-                inst->inst_name, (u_long)ep->ep_id, 0);
-            goto err_out;
-        }
-
         /*
          * Update the attribute indexes
          */