[SCM] Samba Shared Repository - branch v3-0-test updated -
release-3-0-29-84-g3992c8e
Michael Adam
obnox at samba.org
Wed Jul 9 11:03:53 GMT 2008
The branch, v3-0-test has been updated
via 3992c8e3a38d925d0b9f4989099ef86fbe917305 (commit)
from dd781951fb9acc556f1bd6760b72151a7c359a9f (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-0-test
- Log -----------------------------------------------------------------
commit 3992c8e3a38d925d0b9f4989099ef86fbe917305
Author: Michael Adam <obnox at samba.org>
Date: Wed Jul 9 13:02:54 2008 +0200
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
-----------------------------------------------------------------------
Summary of changes:
source/tdb/tools/tdbtool.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/tdb/tools/tdbtool.c b/source/tdb/tools/tdbtool.c
index 9592c39..4bddf76 100644
--- 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;
}
--
Samba Shared Repository
More information about the samba-cvs
mailing list