upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-26 01:29:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#7176 fix slapindex -q -t

Browse source
This commit is contained in:
Howard Chu 2012-02-20 17:04:24 -08:00
parent 33f6bc4fe6
commit 164e738878
1 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
servers/slapd/back-mdb/tools.c
View file

@ -764,22 +764,6 @@ int mdb_tool_entry_reindex(
mi->mi_nattrs = i;
}
if ( slapMode & SLAP_TRUNCATE_MODE ) {
int i;
for ( i=0; i < mi->mi_nattrs; i++ ) {
rc = mdb_drop( txn, mi->mi_attrs[i]->ai_dbi, 0 );
if ( rc ) {
Debug( LDAP_DEBUG_ANY,
LDAP_XSTRING(mdb_tool_entry_reindex)
": (Truncate) mdb_drop(%s) failed: %s (%d)\n",
mi->mi_attrs[i]->ai_desc->ad_type->sat_cname.bv_val,
mdb_strerror(rc), rc );
return -1;
}
}
slapMode ^= SLAP_TRUNCATE_MODE;
}
e = mdb_tool_entry_get( be, id );
if( e == NULL ) {
@ -801,6 +785,22 @@ int mdb_tool_entry_reindex(
}
}
if ( slapMode & SLAP_TRUNCATE_MODE ) {
int i;
for ( i=0; i < mi->mi_nattrs; i++ ) {
rc = mdb_drop( txi, mi->mi_attrs[i]->ai_dbi, 0 );
if ( rc ) {
Debug( LDAP_DEBUG_ANY,
LDAP_XSTRING(mdb_tool_entry_reindex)
": (Truncate) mdb_drop(%s) failed: %s (%d)\n",
mi->mi_attrs[i]->ai_desc->ad_type->sat_cname.bv_val,
mdb_strerror(rc), rc );
return -1;
}
}
slapMode ^= SLAP_TRUNCATE_MODE;
}
/*
* just (re)add them for now
* Use truncate mode to empty/reset index databases