summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2009-01-16 00:40:48 +0100
committerMichael Adam <obnox@samba.org>2009-01-16 01:02:23 +0100
commit99ef38c84fa902494b7b6fe8e75dd78303a5f7a9 (patch)
tree11f6c8688434546f0fe09a144c521c70bdac3334
parentedbc7efa35c39819e1ca31e1b45ce47f3e6924b5 (diff)
downloadsamba-99ef38c84fa902494b7b6fe8e75dd78303a5f7a9.tar.gz
samba-99ef38c84fa902494b7b6fe8e75dd78303a5f7a9.tar.bz2
samba-99ef38c84fa902494b7b6fe8e75dd78303a5f7a9.zip
s3:put the browse list into cache_dir, not lock_dir.
Michael
-rw-r--r--source3/nmbd/nmbd_serverlistdb.c9
-rw-r--r--source3/smbd/lanman.c4
2 files changed, 3 insertions, 10 deletions
diff --git a/source3/nmbd/nmbd_serverlistdb.c b/source3/nmbd/nmbd_serverlistdb.c
index 349c3f4df3..28c164fc14 100644
--- a/source3/nmbd/nmbd_serverlistdb.c
+++ b/source3/nmbd/nmbd_serverlistdb.c
@@ -326,14 +326,7 @@ void write_browse_list(time_t t, bool force_write)
updatecount++;
- fname = talloc_strdup(ctx, lp_lockdir());
- if (!fname) {
- return;
- }
- trim_char(fname,'\0' ,'/');
- fname = talloc_asprintf_append(fname,
- "/%s",
- SERVER_LIST);
+ fname = cache_path(SERVER_LIST);
if (!fname) {
return;
}
diff --git a/source3/smbd/lanman.c b/source3/smbd/lanman.c
index 6ed3ce2c87..c8e35783c0 100644
--- a/source3/smbd/lanman.c
+++ b/source3/smbd/lanman.c
@@ -1154,9 +1154,9 @@ static int get_server_info(uint32 servertype,
bool local_list_only;
int i;
- lines = file_lines_load(lock_path(SERVER_LIST), NULL, 0, NULL);
+ lines = file_lines_load(cache_path(SERVER_LIST), NULL, 0, NULL);
if (!lines) {
- DEBUG(4,("Can't open %s - %s\n",lock_path(SERVER_LIST),strerror(errno)));
+ DEBUG(4,("Can't open %s - %s\n",cache_path(SERVER_LIST),strerror(errno)));
return 0;
}