mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-12 10:54:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

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