summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2010-09-24 15:39:43 +0930
committerRusty Russell <rusty@rustcorp.com.au>2010-09-27 10:48:28 +0930
commitccac258d14dda7d8a994a7b80474ce6d85478a6d (patch)
treef10816ce8e8a62febdb1eb5cb177227e5ed8ef75
parent3258cf3f11bf7c68a2e69e1808c4551cc899725a (diff)
downloadsamba-ccac258d14dda7d8a994a7b80474ce6d85478a6d.tar.gz
samba-ccac258d14dda7d8a994a7b80474ce6d85478a6d.tar.bz2
samba-ccac258d14dda7d8a994a7b80474ce6d85478a6d.zip
tdb: automatically identify Jenkins hash tdbs
If the caller to tdb_open_ex() doesn't specify a hash, and tdb_old_hash doesn't match, try tdb_jenkins_hash. This was Metze's idea: it makes life simpler, especially with the upcoming TDB_INCOMPATIBLE_HASH flag. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
-rw-r--r--lib/tdb/common/open.c41
1 files changed, 27 insertions, 14 deletions
diff --git a/lib/tdb/common/open.c b/lib/tdb/common/open.c
index f0e2dfc7e1..9a82bc9bad 100644
--- a/lib/tdb/common/open.c
+++ b/lib/tdb/common/open.c
@@ -37,7 +37,7 @@ void tdb_header_hash(struct tdb_context *tdb,
TDB_DATA hash_key;
uint32_t tdb_magic = TDB_MAGIC;
- hash_key.dptr = (unsigned char *)TDB_MAGIC_FOOD;
+ hash_key.dptr = discard_const_p(unsigned char, TDB_MAGIC_FOOD);
hash_key.dsize = sizeof(TDB_MAGIC_FOOD);
*magic1_hash = tdb->hash_fn(&hash_key);
@@ -136,6 +136,23 @@ static void null_log_fn(struct tdb_context *tdb, enum tdb_debug_level level, con
{
}
+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,
@@ -148,9 +165,8 @@ struct tdb_context *tdb_open_ex(const char *name, int hash_size, int tdb_flags,
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 */
@@ -175,10 +191,10 @@ struct tdb_context *tdb_open_ex(const char *name, int hash_size, int tdb_flags,
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 */
@@ -301,23 +317,20 @@ struct tdb_context *tdb_open_ex(const char *name, int hash_size, int tdb_flags,
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;
}