Import ldif2ldbm 'no write sync' change...

diff --git a/servers/slapd/tools/ldif2id2children.c b/servers/slapd/tools/ldif2id2children.c
index 24fc88a307a65df3c0aa1866a293491bfbd6d454..9ff967dfa868e2a36fc456a953023b6e9b88cd45 100644 (file)
--- a/servers/slapd/tools/ldif2id2children.c
+++ b/servers/slapd/tools/ldif2id2children.c
@@ -61,6 +61,7 @@ main( int argc, char **argv )
        ID              id;
        struct dbcache  *db, *db2;
        Backend         *be = NULL;
+       struct ldbminfo *li;
        struct berval   bv;
        struct berval   *vals[2];
        Avlnode         *avltypes = NULL;
@@ -127,6 +128,10 @@ main( int argc, char **argv )
        }
        be = &backends[dbnum];
 
+       /* disable write sync'ing */
+       li = (struct ldbminfo *) be->be_private;
+       li->li_dbcachewsync = 0;
+
        /*
         * first, make the dn2id index
         */

diff --git a/servers/slapd/tools/ldif2id2entry.c b/servers/slapd/tools/ldif2id2entry.c
index 2316130e7a6883d8bb04564c15086f1b8b880da3..2f46d3c5338f016bd4e43fe0740bb9787a67062d 100644 (file)
--- a/servers/slapd/tools/ldif2id2entry.c
+++ b/servers/slapd/tools/ldif2id2entry.c
@@ -56,7 +56,8 @@ main( int argc, char **argv )
        int             dbnum;
        ID              id;
        struct dbcache  *db;
-       Backend         *be;
+       Backend         *be = NULL;
+       struct ldbminfo *li;
        struct berval   bv;
        struct berval   *vals[2];
        Avlnode         *avltypes = NULL;
@@ -124,6 +125,10 @@ main( int argc, char **argv )
        }
        be = &backends[dbnum];
 
+       /* disable write sync'ing */
+       li = (struct ldbminfo *) be->be_private;
+       li->li_dbcachewsync = 0;
+
        if ( (db = ldbm_cache_open( be, "id2entry", LDBM_SUFFIX, LDBM_NEWDB ))
            == NULL ) {
                perror( "id2entry file" );

diff --git a/servers/slapd/tools/ldif2index.c b/servers/slapd/tools/ldif2index.c
index 918a054d99fd1ed68230d89ecc4ab5fab592a94a..15979b7e7d3991be937ebe2ea40d5bc99fa4ebca 100644 (file)
--- a/servers/slapd/tools/ldif2index.c
+++ b/servers/slapd/tools/ldif2index.c
@@ -58,6 +58,7 @@ main( int argc, char **argv )
        int             dbnum;
        unsigned long   id;
        Backend         *be = NULL;
+       struct ldbminfo *li;
        struct berval   bv;
        struct berval   *vals[2];
 
@@ -121,6 +122,10 @@ main( int argc, char **argv )
        }
        be = &backends[dbnum];
 
+       /* disable write sync'ing */
+       li = (struct ldbminfo *) be->be_private;
+       li->li_dbcachewsync = 0;
+
        attr_masks( be->be_private, attr, &indexmask, &syntaxmask );
        if ( indexmask == 0 ) {
                exit( 0 );

diff --git a/servers/slapd/tools/ldif2ldbm.c b/servers/slapd/tools/ldif2ldbm.c
index 97cffe4124cb26f893bd5df419677c08801534e3..7f759367cc362d80de0661d205127cdc45cdf71b 100644 (file)
--- a/servers/slapd/tools/ldif2ldbm.c
+++ b/servers/slapd/tools/ldif2ldbm.c
@@ -70,6 +70,7 @@ main( int argc, char **argv )
        int             dbnum;
        ID              id;
        Backend         *be = NULL;
+       struct ldbminfo *li;
        struct berval   bv;
        struct berval   *vals[2];
        Avlnode         *avltypes = NULL;
@@ -146,6 +147,10 @@ main( int argc, char **argv )
        }
        be = &backends[dbnum];
 
+       /* disable write sync'ing */
+       li = (struct ldbminfo *) be->be_private;
+       li->li_dbcachewsync = 0;
+
        /*
         * generate the id2entry index
         */