mirror of
https://github.com/samba-team/samba.git
synced 2025-01-12 09:18:10 +03:00
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 7090d9f693
)
This commit is contained in:
parent
4724780212
commit
d606f8cb1e
@ -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) {
|
||||
|
Loading…
Reference in New Issue
Block a user