Updated some items

[openldap] / servers / slapd / tools / ldif2id2children-bdb2.c

diff --git a/servers/slapd/tools/ldif2id2children-bdb2.c b/servers/slapd/tools/ldif2id2children-bdb2.c
index be5a435bef1d187c9d5d543ba1e828a138c3b535..3144339f11ce70ed560c147d718c46889a5ef383 100644 (file)
--- a/servers/slapd/tools/ldif2id2children-bdb2.c
+++ b/servers/slapd/tools/ldif2id2children-bdb2.c
@@ -117,7 +117,7 @@ main( int argc, char **argv )
         * first, make the dn2id index
         */
 
-       if ( (db = bdb2i_cache_open( be, "dn2id", LDBM_SUFFIX, LDBM_NEWDB ))
+       if ( (db = bdb2i_cache_open( be, "dn2id", BDB2_SUFFIX, LDBM_NEWDB ))
            == NULL ) {
                perror( "dn2id file" );
                exit( 1 );
@@ -176,7 +176,7 @@ main( int argc, char **argv )
                                }
 
                                if ( linep == NULL ) {
-                                       fprintf( stderr, "entry %lu has no dn\n",
+                                       fprintf( stderr, "entry %ld has no dn\n",
                                            id );
                                } else {
                                        key.dptr = dn_normalize_case( val );
@@ -202,7 +202,7 @@ main( int argc, char **argv )
         * next, make the id2children index
         */
 
-       if ( (db2 = bdb2i_cache_open( be, "id2children", LDBM_SUFFIX,
+       if ( (db2 = bdb2i_cache_open( be, "id2children", BDB2_SUFFIX,
            LDBM_NEWDB )) == NULL ) {
                perror( "id2children file" );
                exit( 1 );
@@ -257,7 +257,7 @@ main( int argc, char **argv )
                                }
 
                                if ( linep == NULL ) {
-                                       fprintf( stderr, "entry %lu has no dn\n",
+                                       fprintf( stderr, "entry %ld has no dn\n",
                                            id );
                                } else {
                                        if ( (dn = dn_parent( be, val ))
@@ -291,9 +291,9 @@ main( int argc, char **argv )
                                        sprintf( buf2, "%c%ld", EQ_PREFIX, pid );
                                        key.dptr = buf2;
                                        key.dsize = strlen( buf2 ) + 1;
-                                       if ( idl_insert_key( be, db2, key, id )
+                                       if ( bdb2i_idl_insert_key( be, db2, key, id )
                                            != 0 ) {
-                                               perror( "idl_insert_key" );
+                                               perror( "bdb2i_idl_insert_key" );
                                                exit( 1 );
                                        }
                                }