s3:put the browse list into cache_dir, not lock_dir.

Michael

diff --git a/source3/nmbd/nmbd_serverlistdb.c b/source3/nmbd/nmbd_serverlistdb.c
index 349c3f4df3d8767d76bab4cfe1539938e2abc135..28c164fc1458eceabf99daef5c7536b7965a5b7d 100644 (file)
--- 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 6ed3ce2c87e00218cfa30b269bd8a84350193d9e..c8e35783c0fd4b0591288137b8c63e874fffe4f2 100644 (file)
--- 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;
        }