diff options
| author | Jeremy Allison <jra@samba.org> | 2010-09-27 05:46:07 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2010-09-27 17:18:54 -0700 |
| commit | f98d217514433cd06887f8c0217a7835392f0375 (patch) | |
| tree | c7bf61f24c3381c9f7996a0a19045d36af3f0783 /source3/lib/gencache.c | |
| parent | 66761423474edc9736a8a6eae6feaaf958d89d0e (diff) | |
| download | samba-f98d217514433cd06887f8c0217a7835392f0375.tar.gz samba-f98d217514433cd06887f8c0217a7835392f0375.tar.bz2 samba-f98d217514433cd06887f8c0217a7835392f0375.zip | |
Change to using TDB_INCOMPATIBLE_HASH (the jenkins hash) on all
TDB_CLEAR_IF_FIRST tdb's. For tdb's like gencache where we open
without CLEAR_IF_FIRST and then with CLEAR_IF_FIRST if corrupt
this is still safe to use as if opening an existing tdb the new
hash will be ignored - it's only used on creating a new tdb not
opening an old one.
Jeremy.
Diffstat (limited to 'source3/lib/gencache.c')
| -rw-r--r-- | source3/lib/gencache.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/lib/gencache.c b/source3/lib/gencache.c index a78e60a153..8d2ddb2387 100644 --- a/source3/lib/gencache.c +++ b/source3/lib/gencache.c @@ -65,7 +65,7 @@ static bool gencache_init(void) DEBUG(5, ("Opening cache file at %s\n", cache_fname)); again: - cache = tdb_open_log(cache_fname, 0, TDB_DEFAULT, open_flags, 0644); + cache = tdb_open_log(cache_fname, 0, TDB_DEFAULT|TDB_INCOMPATIBLE_HASH, open_flags, 0644); if (cache) { int ret; ret = tdb_check(cache, NULL, NULL); @@ -80,7 +80,7 @@ again: first_try = false; DEBUG(0, ("gencache_init: tdb_check(%s) failed - retry after CLEAR_IF_FIRST\n", cache_fname)); - cache = tdb_open_log(cache_fname, 0, TDB_CLEAR_IF_FIRST, open_flags, 0644); + cache = tdb_open_log(cache_fname, 0, TDB_CLEAR_IF_FIRST|TDB_INCOMPATIBLE_HASH, open_flags, 0644); if (cache) { tdb_close(cache); cache = NULL; @@ -91,7 +91,7 @@ again: if (!cache && (errno == EACCES)) { open_flags = O_RDONLY; - cache = tdb_open_log(cache_fname, 0, TDB_DEFAULT, open_flags, + cache = tdb_open_log(cache_fname, 0, TDB_DEFAULT|TDB_INCOMPATIBLE_HASH, open_flags, 0644); if (cache) { DEBUG(5, ("gencache_init: Opening cache file %s read-only.\n", cache_fname)); @@ -107,7 +107,7 @@ again: DEBUG(5, ("Opening cache file at %s\n", cache_fname)); - cache_notrans = tdb_open_log(cache_fname, 0, TDB_CLEAR_IF_FIRST, + cache_notrans = tdb_open_log(cache_fname, 0, TDB_CLEAR_IF_FIRST|TDB_INCOMPATIBLE_HASH, open_flags, 0644); if (cache_notrans == NULL) { DEBUG(5, ("Opening %s failed: %s\n", cache_fname, |