Revert "tdbtool: fix off-by-one error in argument length. (bug #2344)"

This reverts commit dd781951fb9acc556f1bd6760b72151a7c359a9f.

This fix is not valid:

1. convert_string() is not only used for key strings but also for data.

2. Some databases use string_tdb_data() i.e. non-null-terminated strings
   as keynames and others (like the one I was using), use
   string_term_tdb_data(), i.e. zero-terminated key strings.

After discussion with Metze, the easiest (and proper way) to
handle this is to specify key names as "keyname\0" for databases
which use string_term_tdb_data().

Sorry for the noise...

Michael

diff --git a/source/tdb/tools/tdbtool.c b/source/tdb/tools/tdbtool.c
index 9592c39a91fb6416ab2e48528deae95d74f4d186..4bddf76a233167a194d632a3847f07a0a9adafe9 100644 (file)
--- a/source/tdb/tools/tdbtool.c
+++ b/source/tdb/tools/tdbtool.c
@@ -633,7 +633,7 @@ static char *convert_string(char *instring, size_t *sizep)
        }
        length++;
     }
-    *sizep = length + 1;
+    *sizep = length;
     return instring;
 }