Ditch LRU cache replacement in favor of 2nd-chance/clock.

[openldap] / servers / slapd / bconfig.c

diff --git a/servers/slapd/bconfig.c b/servers/slapd/bconfig.c
index 4ff1d3b954d451814708852ae5a3704c44e0d7c7..b98f578fc4303624f22ca3bb064eb68f64f57e4e 100644 (file)
--- a/servers/slapd/bconfig.c
+++ b/servers/slapd/bconfig.c
@@ -1509,7 +1509,7 @@ config_generic(ConfigArgs *c) {
                        break;
 
                case CFG_ROOTDSE:
-                       if(read_root_dse_file(c->argv[1])) {
+                       if(root_dse_read_file(c->argv[1])) {
                                snprintf( c->msg, sizeof( c->msg ), "<%s> could not read file", c->argv[0] );
                                Debug(LDAP_DEBUG_ANY, "%s: %s %s\n",
                                        c->log, c->msg, c->argv[1] );
@@ -4866,6 +4866,7 @@ config_back_modrdn( Operation *op, SlapReply *rs )
        ldap_pvt_thread_pool_pause( &connection_pool );
 
        if ( ce->ce_type == Cft_Schema ) {
+               req_modrdn_s modr = op->oq_modrdn;
                struct berval rdn;
                Attribute *a;
                rs->sr_err = config_rename_attr( rs, ce->ce_entry, &rdn, &a );
@@ -4874,6 +4875,7 @@ config_back_modrdn( Operation *op, SlapReply *rs )
                                ce->ce_parent, a, &op->orr_newrdn, &op->orr_nnewrdn,
                                cfb->cb_use_ldif );
                }
+               op->oq_modrdn = modr;
        } else {
                CfEntryInfo *ce2, *cebase, **cprev, **cbprev, *ceold;
                req_modrdn_s modr = op->oq_modrdn;