Merge in all devel changes since 2.0-alpha2.

[openldap] / servers / slapd / tools / slapindex.c

diff --git a/servers/slapd/tools/slapindex.c b/servers/slapd/tools/slapindex.c
index 77abcd9798a763700db69e061ceb031041d0a2cf..ba63e7079950a4be29311b1b06d449d42d7f8499 100644 (file)
--- a/servers/slapd/tools/slapindex.c
+++ b/servers/slapd/tools/slapindex.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
@@ -55,7 +56,6 @@ main( int argc, char **argv )
                id != NOID;
                id = be->be_entry_next( be ) )
        {
-               Attribute *attr;
                struct berval **values;
                Entry* e = be->be_entry_get( be, id );
                struct berval bv;
@@ -75,7 +75,15 @@ main( int argc, char **argv )
                }
 
                if( strcasecmp( type, "dn" ) == 0 ) {
-                       attr = attr_find( e->e_attrs, type );
+                       bv.bv_val = e->e_ndn;
+                       bv.bv_len = strlen( bv.bv_val );
+                       bvals[0] = &bv;
+                       bvals[1] = NULL;
+
+                       values = bvals;
+
+               } else {
+                       Attribute *attr = attr_find( e->e_attrs, type );
 
                        if( attr == NULL ) {
                                entry_free( e );
@@ -83,18 +91,10 @@ main( int argc, char **argv )
                        }
 
                        values = attr->a_vals;
-
-               } else {
-                       bv.bv_val = e->e_ndn;
-                       bv.bv_len = strlen( bv.bv_val );
-                       bvals[0] = &bv;
-                       bvals[1] = NULL;
-
-                       values = bvals;
                }
 
                if ( be->be_index_change( be,
-                       type, attr->a_vals, id, SLAP_INDEX_ADD_OP ) )
+                       type, values, id, SLAP_INDEX_ADD_OP ) )
                {
                        rc = EXIT_FAILURE;