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

[Noriko Hosoi]

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

New commits:
commit c41920065398819fed0f1ec31dc89746fe7113f0
Author: Noriko Hosoi <nhosoi at redhat.com>
Date:   Thu May 13 12:18:43 2010 -0700

    Another bug fix made in commit 142d7ada626173de4937330be6776fabbebe9f60
    
    591336 - Implementing upgrade DN format tool
    
    Mistakenly removed a password encoding code.
    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 336c3d6..20dce13 100644
--- a/ldap/servers/slapd/back-ldbm/import-threads.c
+++ b/ldap/servers/slapd/back-ldbm/import-threads.c
@@ -627,6 +627,15 @@ void import_producer(void *param)
             continue;
         }
 
+        /* not sure what this does, but it looked like it could be
+         * simplified.  if it's broken, it's my fault.  -robey 
+         */
+        if (slapi_entry_attr_find(ep->ep_entry, "userpassword", &attr) == 0) {
+            Slapi_Value **va = attr_get_present_values(attr);
+
+            pw_encodevals( (Slapi_Value **)va ); /* jcm - cast away const */
+        }
+
         if (job->flags & FLAG_ABORT) { 
             backentry_free(&ep);
             goto error;
@@ -855,15 +864,6 @@ void index_producer(void *param)
         if (!ep)
             goto error;
 
-        /* not sure what this does, but it looked like it could be
-         * simplified.  if it's broken, it's my fault.  -robey 
-         */
-        if (slapi_entry_attr_find(ep->ep_entry, "userpassword", &attr) == 0) {
-            Slapi_Value **va = attr_get_present_values(attr);
-
-            pw_encodevals( (Slapi_Value **)va ); /* jcm - cast away const */
-        }
-
         if (job->flags & FLAG_ABORT)
              goto error;