diff options
| author | Jeremy Allison <jra@samba.org> | 2011-09-14 14:07:29 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2011-09-15 00:43:04 +0200 |
| commit | cc6f0231c9e75e88ab68dc97596a040b3f008791 (patch) | |
| tree | d3546692e33830b80ed64f7dbbee1d9f12e6afd3 /source3/winbindd/winbindd_cache.c | |
| parent | ff52be06e5c5581fe4acf6dc4f5a5e60ddbc8f52 (diff) | |
| download | samba-cc6f0231c9e75e88ab68dc97596a040b3f008791.tar.gz samba-cc6f0231c9e75e88ab68dc97596a040b3f008791.tar.bz2 samba-cc6f0231c9e75e88ab68dc97596a040b3f008791.zip | |
Finish commit 8745c70d by Michael Adam.
If you're going to move winbindd_cache.tdb to the state_path, do it *everywhere*.
Found by Ira Cooper <ira@wakeful.net>.
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Thu Sep 15 00:43:04 CEST 2011 on sn-devel-104
Diffstat (limited to 'source3/winbindd/winbindd_cache.c')
| -rw-r--r-- | source3/winbindd/winbindd_cache.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source3/winbindd/winbindd_cache.c b/source3/winbindd/winbindd_cache.c index b52fe77429..2bb4df9736 100644 --- a/source3/winbindd/winbindd_cache.c +++ b/source3/winbindd/winbindd_cache.c @@ -3150,9 +3150,9 @@ bool initialize_winbindd_cache(void) tdb_close(wcache->tdb); wcache->tdb = NULL; - if (unlink(cache_path("winbindd_cache.tdb")) == -1) { + if (unlink(state_path("winbindd_cache.tdb")) == -1) { DEBUG(0,("initialize_winbindd_cache: unlink %s failed %s ", - cache_path("winbindd_cache.tdb"), + state_path("winbindd_cache.tdb"), strerror(errno) )); return false; } @@ -3279,7 +3279,7 @@ void wcache_flush_cache(void) } /* when working offline we must not clear the cache on restart */ - wcache->tdb = tdb_open_log(cache_path("winbindd_cache.tdb"), + wcache->tdb = tdb_open_log(state_path("winbindd_cache.tdb"), WINBINDD_CACHE_TDB_DEFAULT_HASH_SIZE, TDB_INCOMPATIBLE_HASH | (lp_winbind_offline_logon() ? TDB_DEFAULT : (TDB_DEFAULT | TDB_CLEAR_IF_FIRST)), @@ -4093,7 +4093,7 @@ static void validate_panic(const char *const why) int winbindd_validate_cache(void) { int ret = -1; - const char *tdb_path = cache_path("winbindd_cache.tdb"); + const char *tdb_path = state_path("winbindd_cache.tdb"); TDB_CONTEXT *tdb = NULL; DEBUG(10, ("winbindd_validate_cache: replacing panic function\n")); @@ -4136,7 +4136,7 @@ done: int winbindd_validate_cache_nobackup(void) { int ret = -1; - const char *tdb_path = cache_path("winbindd_cache.tdb"); + const char *tdb_path = state_path("winbindd_cache.tdb"); DEBUG(10, ("winbindd_validate_cache: replacing panic function\n")); smb_panic_fn = validate_panic; |