{
}
+static bool check_header_hash(struct tdb_context *tdb,
+ bool default_hash, uint32_t *m1, uint32_t *m2)
+{
+ tdb_header_hash(tdb, m1, m2);
+ if (tdb->header.magic1_hash == *m1 &&
+ tdb->header.magic2_hash == *m2) {
+ return true;
+ }
+
+ /* If they explicitly set a hash, always respect it. */
+ if (!default_hash)
+ return false;
+
+ /* Otherwise, try the other inbuilt hash. */
+ tdb->hash_fn = tdb_jenkins_hash;
+ return check_header_hash(tdb, false, m1, m2);
+}
struct tdb_context *tdb_open_ex(const char *name, int hash_size, int tdb_flags,
int open_flags, mode_t mode,
unsigned char *vp;
uint32_t vertest;
unsigned v;
- uint32_t magic1_hash;
- uint32_t magic2_hash;
const char *hash_alg;
+ uint32_t magic1, magic2;
if (!(tdb = (struct tdb_context *)calloc(1, sizeof *tdb))) {
/* Can't log this */
if (hash_fn) {
tdb->hash_fn = hash_fn;
- hash_alg = "user defined";
+ hash_alg = "the user defined";
} else {
tdb->hash_fn = tdb_old_hash;
- hash_alg = "default";
+ hash_alg = "either default";
}
/* cache the page size */
goto fail;
}
- tdb_header_hash(tdb, &magic1_hash, &magic2_hash);
-
if ((tdb->header.magic1_hash == 0) && (tdb->header.magic2_hash == 0)) {
/* older TDB without magic hash references */
- } else if ((tdb->header.magic1_hash != magic1_hash) ||
- (tdb->header.magic2_hash != magic2_hash)) {
+ } else if (!check_header_hash(tdb, !hash_fn, &magic1, &magic2)) {
TDB_LOG((tdb, TDB_DEBUG_FATAL, "tdb_open_ex: "
- "%s was not created with the %s hash function we are using\n"
+ "%s was not created with %s hash function we are using\n"
"magic1_hash[0x%08X %s 0x%08X] "
"magic2_hash[0x%08X %s 0x%08X]\n",
name, hash_alg,
tdb->header.magic1_hash,
- (tdb->header.magic1_hash == magic1_hash) ? "==" : "!=",
- magic1_hash,
+ (tdb->header.magic1_hash == magic1) ? "==" : "!=",
+ magic1,
tdb->header.magic2_hash,
- (tdb->header.magic2_hash == magic2_hash) ? "==" : "!=",
- magic2_hash));
+ (tdb->header.magic2_hash == magic2) ? "==" : "!=",
+ magic2));
errno = EINVAL;
goto fail;
}
{
struct tdb_context *tdb;
unsigned int log_count;
+ TDB_DATA d;
struct tdb_logging_context log_ctx = { log_fn, &log_count };
- plan_tests(18);
+ plan_tests(28);
/* Create with default hash. */
log_count = 0;
O_CREAT|O_RDWR|O_TRUNC, 0600, &log_ctx, NULL);
ok1(tdb);
ok1(log_count == 0);
+ d.dptr = (void *)"Hello";
+ d.dsize = 5;
+ ok1(tdb_store(tdb, d, d, TDB_INSERT) == 0);
tdb_close(tdb);
/* Fail to open with different hash. */
/* Endian should be no problem. */
log_count = 0;
tdb = tdb_open_ex("test/jenkins-le-hash.tdb", 0, 0, O_RDWR, 0,
- &log_ctx, NULL);
+ &log_ctx, tdb_old_hash);
ok1(!tdb);
ok1(log_count == 1);
log_count = 0;
tdb = tdb_open_ex("test/jenkins-be-hash.tdb", 0, 0, O_RDWR, 0,
- &log_ctx, NULL);
+ &log_ctx, tdb_old_hash);
ok1(!tdb);
ok1(log_count == 1);
log_count = 0;
- /* Fail to open with default hash. */
+ /* Fail to open with old default hash. */
tdb = tdb_open_ex("run-wronghash-fail.tdb", 0, 0, O_RDWR, 0,
- &log_ctx, NULL);
+ &log_ctx, tdb_old_hash);
ok1(!tdb);
ok1(log_count == 1);
ok1(tdb_check(tdb, NULL, NULL) == 0);
tdb_close(tdb);
+ /* It should open with jenkins hash if we don't specify. */
+ log_count = 0;
+ tdb = tdb_open_ex("test/jenkins-le-hash.tdb", 0, 0, O_RDWR, 0,
+ &log_ctx, NULL);
+ ok1(tdb);
+ ok1(log_count == 0);
+ ok1(tdb_check(tdb, NULL, NULL) == 0);
+ tdb_close(tdb);
+
+ log_count = 0;
+ tdb = tdb_open_ex("test/jenkins-be-hash.tdb", 0, 0, O_RDWR, 0,
+ &log_ctx, NULL);
+ ok1(tdb);
+ ok1(log_count == 0);
+ ok1(tdb_check(tdb, NULL, NULL) == 0);
+ tdb_close(tdb);
+
+ log_count = 0;
+ tdb = tdb_open_ex("run-wronghash-fail.tdb", 0, 0, O_RDONLY,
+ 0, &log_ctx, NULL);
+ ok1(tdb);
+ ok1(log_count == 0);
+ ok1(tdb_check(tdb, NULL, NULL) == 0);
+ tdb_close(tdb);
+
+
return exit_status();
}