diff options
| author | Martin Pool <mbp@samba.org> | 2003-03-11 04:21:14 +0000 |
|---|---|---|
| committer | Martin Pool <mbp@samba.org> | 2003-03-11 04:21:14 +0000 |
| commit | ee28d38fbc5639140478e51cc33ec0a312d785da (patch) | |
| tree | 6da7fcfdfb9e20fe748934a6a76a2dbe400a42c9 | |
| parent | dcf7cad4bff3797fd2c606f6225a4ed68b0a3c51 (diff) | |
| download | samba-ee28d38fbc5639140478e51cc33ec0a312d785da.tar.gz samba-ee28d38fbc5639140478e51cc33ec0a312d785da.tar.bz2 samba-ee28d38fbc5639140478e51cc33ec0a312d785da.zip | |
When opening an existing DB, don't require the hash_size specified to
the open call to be the same as that of the existing tdb. The
specified hash_size is only used if the tdb needs to be (re)created.
With this patch in place, tdbtool can open the printing tdbs, which
are created with a hash_size of 5000. Before it would fail with EIO.
(This used to be commit e412dd6d7e5a41de94c07c64b186390ccce104cc)
| -rw-r--r-- | source3/tdb/tdb.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source3/tdb/tdb.c b/source3/tdb/tdb.c index 097209ff7a..0ec770ed81 100644 --- a/source3/tdb/tdb.c +++ b/source3/tdb/tdb.c @@ -1728,8 +1728,7 @@ TDB_CONTEXT *tdb_open_ex(const char *name, int hash_size, int tdb_flags, if (read(tdb->fd, &tdb->header, sizeof(tdb->header)) != sizeof(tdb->header) || strcmp(tdb->header.magic_food, TDB_MAGIC_FOOD) != 0 - || tdb->header.version != TDB_VERSION - || (tdb->header.hash_size != hash_size + || (tdb->header.version != TDB_VERSION && !(rev = (tdb->header.version==TDB_BYTEREV(TDB_VERSION))))) { /* its not a valid database - possibly initialise it */ if (!(open_flags & O_CREAT) || tdb_new_database(tdb, hash_size) == -1) { |