diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2011-04-19 21:00:59 +0930 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2011-04-19 14:15:22 +0200 |
| commit | 36cfa7b79e36d880cdbf24d0769558be44d0edda (patch) | |
| tree | 44d8d98a75a90215877ae336fad29bb4d3f30f88 /lib/tdb/common/summary.c | |
| parent | cb884186a55c9ef8aca6ee48b16423b3c881e689 (diff) | |
| download | samba-36cfa7b79e36d880cdbf24d0769558be44d0edda.tar.gz samba-36cfa7b79e36d880cdbf24d0769558be44d0edda.tar.xz samba-36cfa7b79e36d880cdbf24d0769558be44d0edda.zip | |
tdb: make sure we skip over recovery area correctly.
If it's really the recovery area, we can trust the rec_len field, and
don't have to go groping for bitpatterns.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Autobuild-User: Rusty Russell <rusty@rustcorp.com.au>
Autobuild-Date: Tue Apr 19 14:15:22 CEST 2011 on sn-devel-104
Diffstat (limited to 'lib/tdb/common/summary.c')
| -rw-r--r-- | lib/tdb/common/summary.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/lib/tdb/common/summary.c b/lib/tdb/common/summary.c index b222a5993d..171a1a2055 100644 --- a/lib/tdb/common/summary.c +++ b/lib/tdb/common/summary.c @@ -86,12 +86,13 @@ static size_t get_hash_length(struct tdb_context *tdb, unsigned int i) _PUBLIC_ char *tdb_summary(struct tdb_context *tdb) { - tdb_off_t off; + tdb_off_t off, rec_off; struct tally freet, keys, data, dead, extra, hash, uncoal; struct tdb_record rec; char *ret = NULL; bool locked; size_t len, unc = 0; + struct tdb_record recovery; /* Read-only databases use no locking at all: it's best-effort. * We may have a write lock already, so skip that case too. */ @@ -103,6 +104,10 @@ _PUBLIC_ char *tdb_summary(struct tdb_context *tdb) locked = true; } + if (tdb_recovery_area(tdb, tdb->methods, &rec_off, &recovery) != 0) { + goto unlock; + } + tally_init(&freet); tally_init(&keys); tally_init(&data); @@ -135,7 +140,11 @@ _PUBLIC_ char *tdb_summary(struct tdb_context *tdb) case TDB_RECOVERY_INVALID_MAGIC: case 0x42424242: unc++; - rec.rec_len = tdb_dead_space(tdb, off) - sizeof(rec); + /* If it's a valid recovery, we can trust rec_len. */ + if (off != rec_off) { + rec.rec_len = tdb_dead_space(tdb, off) + - sizeof(rec); + } /* Fall through */ case TDB_DEAD_MAGIC: tally_add(&dead, rec.rec_len); |