From 7d09b42943ddae111aa57bdb5e72e750c742cb9a Mon Sep 17 00:00:00 2001
From: Noriko Hosoi <nhosoi@redhat.com>
Date: May 14 2010 00:33:12 +0000
Subject: 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) {