IDs in the LDIF input were not being used in id2children creation.

diff --git a/servers/slapd/tools/ldif2id2children-bdb2.c b/servers/slapd/tools/ldif2id2children-bdb2.c
index 61113a3462db65b0a7f856b9995082301fc2836e..713b461dd98c345bf7993672b74156c3aeb78e9b 100644 (file)
--- a/servers/slapd/tools/ldif2id2children-bdb2.c
+++ b/servers/slapd/tools/ldif2id2children-bdb2.c
@@ -240,7 +240,11 @@ main( int argc, char **argv )
                }
                if ( line[0] == '\n' || stop && buf && *buf ) {
                        if ( * buf != '\n' ) {
-                               id++;
+                               if (isdigit((unsigned char) *buf)) {
+                                       id = atol(buf);
+                               } else {
+                                       id++;
+                               }
                                s = buf;
                                while ( (linep = ldif_getline( &s )) != NULL ) {
                                        if ( ldif_parse_line( linep, &type, &val,

diff --git a/servers/slapd/tools/ldif2id2children.c b/servers/slapd/tools/ldif2id2children.c
index 6eb25ea47342c20f4e813ade5a906dac90815bf8..459579e7f1b033547d1dc4d3dfb147c4fd5eb97f 100644 (file)
--- a/servers/slapd/tools/ldif2id2children.c
+++ b/servers/slapd/tools/ldif2id2children.c
@@ -242,7 +242,11 @@ main( int argc, char **argv )
                }
                if ( line[0] == '\n' || stop && buf && *buf ) {
                        if ( * buf != '\n' ) {
-                               id++;
+                               if (isdigit((unsigned char) *buf)) {
+                                       id = atol(buf);
+                               } else {
+                                       id++;
+                               }
                                s = buf;
                                while ( (linep = ldif_getline( &s )) != NULL ) {
                                        if ( ldif_parse_line( linep, &type, &val,