Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6487
Modified Files:
ldif2ldbm.c
Log Message:
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.
Index: ldif2ldbm.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/ldif2ldbm.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ldif2ldbm.c 10 Nov 2006 23:45:39 -0000 1.11
+++ ldif2ldbm.c 13 Dec 2006 22:21:22 -0000 1.12
@@ -783,7 +783,7 @@
* 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 @@
"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) {
Show replies by date