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/utils | |
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/utils')
-rw-r--r-- | source3/utils/smbcontrol.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/utils/smbcontrol.c b/source3/utils/smbcontrol.c index 246c3aa9b8..97161a09bc 100644 --- a/source3/utils/smbcontrol.c +++ b/source3/utils/smbcontrol.c @@ -954,10 +954,10 @@ static bool do_winbind_online(struct messaging_context *msg_ctx, /* Remove the entry in the winbindd_cache tdb to tell a later starting winbindd that we're online. */ - tdb = tdb_open_log(cache_path("winbindd_cache.tdb"), 0, TDB_DEFAULT, O_RDWR, 0600); + tdb = tdb_open_log(state_path("winbindd_cache.tdb"), 0, TDB_DEFAULT, O_RDWR, 0600); if (!tdb) { fprintf(stderr, "Cannot open the tdb %s for writing.\n", - cache_path("winbindd_cache.tdb")); + state_path("winbindd_cache.tdb")); return False; } @@ -984,14 +984,14 @@ static bool do_winbind_offline(struct messaging_context *msg_ctx, starting winbindd that we're offline. We may actually create it here... */ - tdb = tdb_open_log(cache_path("winbindd_cache.tdb"), + tdb = tdb_open_log(state_path("winbindd_cache.tdb"), WINBINDD_CACHE_TDB_DEFAULT_HASH_SIZE, TDB_DEFAULT|TDB_INCOMPATIBLE_HASH /* TDB_CLEAR_IF_FIRST */, O_RDWR|O_CREAT, 0600); if (!tdb) { fprintf(stderr, "Cannot open the tdb %s for writing.\n", - cache_path("winbindd_cache.tdb")); + state_path("winbindd_cache.tdb")); return False; } |