Move maxkids = cmdkids after fork of ldif2id2children. Also fix NT waiting for kids

diff --git a/servers/slapd/tools/ldif2ldbm.c b/servers/slapd/tools/ldif2ldbm.c
index ec0ca9c5067e3ba36bf15b12c1c3cfe6c4c437a8..d84276b3c20b796cdcc40183c328e2e8f8c2a9d3 100644 (file)
--- a/servers/slapd/tools/ldif2ldbm.c
+++ b/servers/slapd/tools/ldif2ldbm.c
@@ -173,8 +173,6 @@ main( int argc, char **argv )
        args[i++] = NULL;
        fork_child( cmd, args );
 
-    maxkids = cmdkids;
-
        /*
         * generate the dn2id and id2children indexes
         */
@@ -197,6 +195,8 @@ main( int argc, char **argv )
        args[i++] = NULL;
        fork_child( cmd, args );
 
+    maxkids = cmdkids;
+
        /*
         * generate the attribute indexes
         */
@@ -334,7 +334,7 @@ wait4kids( int nkidval )
     DWORD  wait_index;
     while( nkids >= nkidval )
     {
-        wait_index = WaitForMultipleObjects( nkids, processes, TRUE, INFINITE );
+        wait_index = WaitForMultipleObjects( nkids, processes, FALSE, INFINITE );
         /*
         *  processes[wait_index] completed.  Move any remaining indexes into its
         *  place in the array so it stays filled.