mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-15 03:01:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

back-mdb Multival fixes

Browse Source 
Fix multival logic on Replace
Fix return codes from modify_internal, id2entry_put
This commit is contained in:
Howard Chu 2018-02-22 03:12:32 +00:00
parent 08851a8200
commit 8300eee017
2 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
servers/slapd/back-mdb/id2entry.c
View File

@ -307,18 +307,23 @@ again:
MDB_cursor *mvc;
Attribute *a;
rc = mdb_cursor_open( txn, mdb->mi_dbis[MDB_ID2VAL], &mvc );
if( rc )
return rc;
if( !rc ) {
for ( a = ec.multi; a; a=a->a_next ) {
if (!(a->a_flags & SLAP_ATTR_BIG_MULTI))
continue;
rc = mdb_mval_put( op, mvc, e->e_id, a );
if( rc != LDAP_SUCCESS )
if( rc )
break;
}
mdb_cursor_close( mvc );
if ( rc )
return rc;
}
if ( rc ) {
Debug( LDAP_DEBUG_ANY,
"mdb_id2entry_put: mdb_mval_put failed: %s(%d) \"%s\"\n",
mdb_strerror(rc), rc,
e->e_nname.bv_val );
return LDAP_OTHER;
}
}
}
if (rc) {

21
servers/slapd/back-mdb/modify.c
View File

@ -183,9 +183,12 @@ do_add:
if ( anew->a_flags & SLAP_ATTR_BIG_MULTI ) {
if (!mvc) {
err = mdb_cursor_open( tid, mdb->mi_dbis[MDB_ID2VAL], &mvc );
if (err)
if (err) {
mval_fail: strncpy( textbuf, mdb_strerror( err ), textlen );
err = LDAP_OTHER;
break;
}
}
/* if prev was set, just add new values */
if (a_flags & SLAP_ATTR_BIG_MULTI ) {
anew = (Attribute *)mod;
@ -199,6 +202,8 @@ do_add:
if (anew->a_nvals == anew->a_vals)
anew->a_nvals = NULL;
}
if ( err )
goto mval_fail;
}
}
break;
@ -237,7 +242,7 @@ do_del:
if (!mvc) {
err = mdb_cursor_open( tid, mdb->mi_dbis[MDB_ID2VAL], &mvc );
if (err)
break;
goto mval_fail;
}
if ( mod->sm_numvals ) {
anew = attr_find( e->e_attrs, mod->sm_desc );
@ -259,6 +264,8 @@ do_del:
anew->a_numvals = 0;
}
err = mdb_mval_del( op, mvc, e->e_id, anew );
if ( err )
goto mval_fail;
}
}
break;
@ -279,7 +286,7 @@ do_del:
if (!mvc) {
err = mdb_cursor_open( tid, mdb->mi_dbis[MDB_ID2VAL], &mvc );
if (err)
break;
goto mval_fail;
}
/* delete all values */
anew = &a_dummy;
@ -287,17 +294,19 @@ do_del:
anew->a_numvals = 0;
err = mdb_mval_del( op, mvc, e->e_id, anew );
if (err)
break;
goto mval_fail;
}
anew = attr_find( e->e_attrs, mod->sm_desc );
if (mod->sm_numvals >= mdb->mi_multi_lo) {
if (mod->sm_numvals > mdb->mi_multi_hi) {
anew->a_flags |= SLAP_ATTR_BIG_MULTI;
if (!mvc) {
err = mdb_cursor_open( tid, mdb->mi_dbis[MDB_ID2VAL], &mvc );
if (err)
break;
goto mval_fail;
}
err = mdb_mval_put(op, mvc, e->e_id, anew);
if (err)
goto mval_fail;
} else if (anew) {
/* revert back to normal attr */
anew->a_flags &= ~SLAP_ATTR_BIG_MULTI;