ldap/admin/src/scripts/70upgradednformat.pl | 2 --
ldap/servers/slapd/back-ldbm/import-threads.c | 3 +--
ldap/servers/slapd/back-ldbm/ldif2ldbm.c | 4 +++-
3 files changed, 4 insertions(+), 5 deletions(-)
New commits:
commit 90d116d77230d9544ccff123dc63eb6786faa08e
Author: Noriko Hosoi <nhosoi(a)redhat.com>
Date: Thu May 13 23:31:18 2010 -0700
Additional fix for 591336 - Implementing upgrade DN format tool
If an db instance dir does not have entrydn.db4, skip the instance
instead of returning an error.
diff --git a/ldap/admin/src/scripts/70upgradednformat.pl b/ldap/admin/src/scripts/70upgradednformat.pl
index b223e12..639a282 100644
--- a/ldap/admin/src/scripts/70upgradednformat.pl
+++ b/ldap/admin/src/scripts/70upgradednformat.pl
@@ -136,8 +136,6 @@ sub runinst {
return ("error_cant_convert_db", $backend, $rc);
}
}
- } else {
- return ("error_missing_entrydn", $backend);
}
$backend_entry = $conn->nextEntry();
commit a8ec9c6897c1c6c57f10f247852a8ae9e93ebc63
Author: Noriko Hosoi <nhosoi(a)redhat.com>
Date: Thu May 13 18:07:37 2010 -0700
A bug fix made in commit a5a9949fd16c6d268f0f2676f8bdbb926dc43539
590931 - rhds81 import - hardcoded pages_limit for nsslapd-import-cache-autosize
An old function autosize_import_cache was left.
diff --git a/ldap/servers/slapd/back-ldbm/ldif2ldbm.c b/ldap/servers/slapd/back-ldbm/ldif2ldbm.c
index 79f7225..0cb9062 100644
--- a/ldap/servers/slapd/back-ldbm/ldif2ldbm.c
+++ b/ldap/servers/slapd/back-ldbm/ldif2ldbm.c
@@ -2617,7 +2617,9 @@ int ldbm_back_upgradednformat(Slapi_PBlock *pb)
slapi_pblock_get(pb, SLAPI_PLUGIN_PRIVATE, &li);
if (run_from_cmdline) {
ldbm_config_load_dse_info(li);
- autosize_import_cache(li);
+ if (check_and_set_import_cache(li) < 0) {
+ return -1;
+ }
} else {
slapi_log_error(SLAPI_LOG_FATAL, "Upgrade DN Format",
" Online mode is not supported. "
commit 7d09b42943ddae111aa57bdb5e72e750c742cb9a
Author: Noriko Hosoi <nhosoi(a)redhat.com>
Date: Thu May 13 17:33:12 2010 -0700
Yet another bug fix made in commit 142d7ada626173de4937330be6776fabbebe9f60
591336 - Implementing upgrade DN format tool
These 2 commits broke the build.
commit c41920065398819fed0f1ec31dc89746fe7113f0
commit 1d2ee6dc6296f9c2efeb468edf9d4fddd17b2138
diff --git a/ldap/servers/slapd/back-ldbm/import-threads.c b/ldap/servers/slapd/back-ldbm/import-threads.c
index 20dce13..32fcf46 100644
--- a/ldap/servers/slapd/back-ldbm/import-threads.c
+++ b/ldap/servers/slapd/back-ldbm/import-threads.c
@@ -381,6 +381,7 @@ void import_producer(void *param)
ldif_context c;
int my_version = 0;
size_t newesize = 0;
+ Slapi_Attr *attr = NULL;
PR_ASSERT(info != NULL);
PR_ASSERT(inst != NULL);
@@ -555,7 +556,6 @@ void import_producer(void *param)
/* If we are importing pre-encrypted attributes, we need
* to skip syntax checks for the encrypted values. */
if (!(job->encrypt) && inst->attrcrypt_configured) {
- Slapi_Attr *attr = NULL;
Slapi_Entry *e_copy = NULL;
/* Scan through the entry to see if any present
@@ -802,7 +802,6 @@ void index_producer(void *param)
*/
finished = 0;
while (!finished) {
- Slapi_Attr *attr = NULL;
ID temp_id;
if (job->flags & FLAG_ABORT) {