[389-commits] Branch 'Directory_Server_8_2_Branch' - ldap/servers

[Noriko Hosoi]

 ldap/servers/slapd/back-ldbm/import-threads.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 1d2ee6dc6296f9c2efeb468edf9d4fddd17b2138
Author: Noriko Hosoi <nhosoi at redhat.com>
Date:   Thu May 13 12:11:20 2010 -0700

    A bug fix made in commit 142d7ada626173de4937330be6776fabbebe9f60
    
    591336 - Implementing upgrade DN format tool
    
    Mistakenly removed a function call "import_generate_uniqueid(job, e);"
    Meant to remove it from index_producer, not from import_producer.

diff --git a/ldap/servers/slapd/back-ldbm/import-threads.c b/ldap/servers/slapd/back-ldbm/import-threads.c
index 09a156f..336c3d6 100644
--- a/ldap/servers/slapd/back-ldbm/import-threads.c
+++ b/ldap/servers/slapd/back-ldbm/import-threads.c
@@ -609,6 +609,8 @@ void import_producer(void *param)
             continue;
         }
 
+        /* generate uniqueid if necessary */
+        import_generate_uniqueid(job, e);
         if (g_get_global_lastmod()) {
             import_add_created_attrs(e);
         }
@@ -849,9 +851,6 @@ void index_producer(void *param)
         } 
         slapi_ch_free(&(data.data));
 
-        /* generate uniqueid if necessary */
-        import_generate_uniqueid(job, e);
-
         ep = import_make_backentry(e, temp_id);
         if (!ep)
             goto error;