summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNoriko Hosoi <nhosoi@redhat.com>2006-12-13 22:21:22 +0000
committerNoriko Hosoi <nhosoi@redhat.com>2006-12-13 22:21:22 +0000
commitb956c18caff3237a9cdb562139184cdd9595a0c6 (patch)
treeedc7926bf1022faca98ef76a44135a6146c3234d
parent7810e13a76ac15940316aa722eb07b47bbf4cd4e (diff)
downloadds-b956c18caff3237a9cdb562139184cdd9595a0c6.tar.gz
ds-b956c18caff3237a9cdb562139184cdd9595a0c6.tar.xz
ds-b956c18caff3237a9cdb562139184cdd9595a0c6.zip
Resolves: #202843
Summary: referential integrity plugin does not stack with Class of Service appliance (Comment #16) Changes: Don't call dblayer_close before plugin_closeall.
-rw-r--r--ldap/servers/slapd/back-ldbm/ldif2ldbm.c20
1 files changed, 1 insertions, 19 deletions
diff --git a/ldap/servers/slapd/back-ldbm/ldif2ldbm.c b/ldap/servers/slapd/back-ldbm/ldif2ldbm.c
index e29439d7..9c78068f 100644
--- a/ldap/servers/slapd/back-ldbm/ldif2ldbm.c
+++ b/ldap/servers/slapd/back-ldbm/ldif2ldbm.c
@@ -783,7 +783,7 @@ ldbm_back_ldbm2ldif( Slapi_PBlock *pb )
* Note that we should only call this once. If we're
* dumping several backends then it gets called multiple
* times and we get warnings in the error log like this:
- * WARNING: ldbm instance NetscapeRoot already exists
+ * WARNING: ldbm instance userRoot already exists
*/
ldbm_config_load_dse_info(li);
}
@@ -1205,24 +1205,6 @@ ldbm_back_ldbm2ldif( Slapi_PBlock *pb )
"db2ldif: Failed to close database\n",
0, 0, 0 );
}
- } else if (run_from_cmdline && dump_replica) {
- /*
- * It should not be necessary to close the dblayer here.
- * However it masks complex thread timing issues that
- * prevent a correct shutdown of the plugins. Closing the
- * dblayer here means we cannot dump multiple replicas
- * using -r, but the server doesn't allow that either.
- */
-
- /*
- * Use DBLAYER_NORMAL_MODE to match the value that was provided
- * to dblayer_start() and ensure creation of the guardian file.
- */
- if (0 != dblayer_close(li,DBLAYER_NORMAL_MODE)) {
- LDAPDebug( LDAP_DEBUG_ANY,
- "db2ldif: Failed to close database\n",
- 0, 0, 0 );
- }
}
if (!run_from_cmdline) {