mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-01-30 13:30:57 +08:00
SLAP_NVALUES updates
This commit is contained in:
parent
9ac9102b55
commit
e0c2e71a7c
@ -309,7 +309,13 @@ index_entry(
|
||||
|
||||
/* add each attribute to the indexes */
|
||||
for ( ; ap != NULL; ap = ap->a_next ) {
|
||||
index_values( be, ap->a_desc, ap->a_vals, e->e_id, op );
|
||||
index_values( be, ap->a_desc,
|
||||
#ifdef SLAP_NVALUES
|
||||
ap->a_nvals ? ap->a_nvals : ap->a_vals,
|
||||
#else
|
||||
ap->a_vals,
|
||||
#endif
|
||||
e->e_id, op );
|
||||
}
|
||||
|
||||
#ifdef NEW_LOGGING
|
||||
|
@ -225,8 +225,13 @@ int ldbm_modify_internal(
|
||||
/* start with deleting the old index entries */
|
||||
for ( ap = save_attrs; ap != NULL; ap = ap->a_next ) {
|
||||
if ( ap->a_flags & SLAP_ATTR_IXDEL ) {
|
||||
rc = index_values( be, ap->a_desc, ap->a_vals, e->e_id,
|
||||
SLAP_INDEX_DELETE_OP );
|
||||
rc = index_values( be, ap->a_desc,
|
||||
#ifdef SLAP_NVALUES
|
||||
ap->a_nvals ? ap->a_nvals : ap->a_vals,
|
||||
#else
|
||||
ap->a_vals,
|
||||
#endif
|
||||
e->e_id, SLAP_INDEX_DELETE_OP );
|
||||
if ( rc != LDAP_SUCCESS ) {
|
||||
#ifdef NEW_LOGGING
|
||||
LDAP_LOG( BACK_LDBM, ERR,
|
||||
@ -246,8 +251,13 @@ int ldbm_modify_internal(
|
||||
/* add the new index entries */
|
||||
for ( ap = e->e_attrs; ap != NULL; ap = ap->a_next ) {
|
||||
if ( ap->a_flags & SLAP_ATTR_IXADD ) {
|
||||
rc = index_values( be, ap->a_desc, ap->a_vals, e->e_id,
|
||||
SLAP_INDEX_ADD_OP );
|
||||
rc = index_values( be, ap->a_desc,
|
||||
#ifdef SLAP_NVALUES
|
||||
ap->a_nvals ? ap->a_nvals : ap->a_vals,
|
||||
#else
|
||||
ap->a_vals,
|
||||
#endif
|
||||
e->e_id, SLAP_INDEX_ADD_OP );
|
||||
if ( rc != LDAP_SUCCESS ) {
|
||||
#ifdef NEW_LOGGING
|
||||
LDAP_LOG( BACK_LDBM, ERR,
|
||||
|
Loading…
Reference in New Issue
Block a user