When recreating a database from an ldif file created by ldbmcat,

[openldap] / servers / slapd / back-ldbm / index.c

diff --git a/servers/slapd/back-ldbm/index.c b/servers/slapd/back-ldbm/index.c
index 88d279b8882f37da5c64ed354f1ed3c9fbf1f9b1..1a3a468fc20f606bf17ee4f04f688da72248cf8e 100644 (file)
--- a/servers/slapd/back-ldbm/index.c
+++ b/servers/slapd/back-ldbm/index.c
@@ -265,6 +265,13 @@ index_change_values(
        char            *at_cn; /* Attribute canonical name */
        int             mode;
 
+       if( vals == NULL ) {
+               Debug( LDAP_DEBUG_TRACE,
+                       "=> index_change_values( %s, NULL, %ld, op=%s )\n", 
+                       type, id, ((op == __INDEX_ADD_OP) ? "ADD" : "DELETE" ) );
+               return 0;
+       }
+
        Debug( LDAP_DEBUG_TRACE,
               "=> index_change_values( \"%s\", %ld, op=%s )\n", 
               type, id, ((op == __INDEX_ADD_OP) ? "ADD" : "DELETE" ) );
@@ -306,8 +313,7 @@ index_change_values(
        }
 
 
-       if ( vals != NULL ) {
-         for ( i = 0; vals[i] != NULL; i++ ) {
+       for ( i = 0; vals[i] != NULL; i++ ) {
                /*
                 * presence index entry
                 */
@@ -417,7 +423,6 @@ index_change_values(
                if ( bigbuf != NULL ) {
                        free( bigbuf );
                }
-         }
        }
 
        ldbm_cache_close( be, db );