upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-30 11:39:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix from key_change consolidation

Browse source
This commit is contained in:
Howard Chu 2011-09-05 03:52:38 -07:00
parent e44d4cf06a
commit a4d0cde2d3
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
servers/slapd/back-mdb/idl.c
View file

@ -502,7 +502,9 @@ put1: data.mv_data = &id;
data.mv_size = sizeof(ID);
rc = mdb_cursor_put( cursor, &key[k], &data, MDB_NODUPDATA );
/* Don't worry if it's already there */
if ( rc != 0 && rc != MDB_KEYEXIST ) {
if ( rc == MDB_KEYEXIST )
rc = 0;
if ( rc ) {
err = "c_put id";
goto fail;
}
@ -511,6 +513,7 @@ put1: data.mv_data = &id;
fail:
Debug( LDAP_DEBUG_ANY, "=> mdb_idl_insert_keys: "
"%s failed: %s (%d)\n", err, mdb_strerror(rc), rc );
break;
}
}
return rc;
@ -600,9 +603,12 @@ mdb_idl_delete_keys(
} else {
/* initial c_get failed, nothing was done */
fail:
if ( rc != MDB_NOTFOUND ) {
if ( rc == MDB_NOTFOUND )
rc = 0;
if ( rc ) {
Debug( LDAP_DEBUG_ANY, "=> mdb_idl_delete_key: "
"%s failed: %s (%d)\n", err, mdb_strerror(rc), rc );
break;
}
}
}