luci-0.11: merge r9560

diff --git a/libs/core/luasrc/ccache.lua b/libs/core/luasrc/ccache.lua
index c9771af216b4af3de0a02ef775f64b431c64db75..56ccbc3efe30a85bfb15544818ad0d49a0ad840f 100644 (file)
--- a/libs/core/luasrc/ccache.lua
+++ b/libs/core/luasrc/ccache.lua
@@ -37,7 +37,7 @@ function cache_enable(cachepath, mode)
        mode = mode or "r--r--r--"
 
        local loader = package.loaders[2]
-       local uid    = nixio.getpid("uid")
+       local uid    = nixio.getuid()
 
        if not fs.stat(cachepath) then
                fs.mkdir(cachepath)
@@ -53,7 +53,7 @@ function cache_enable(cachepath, mode)
 
        local function _load_sane(file)
                local stat = fs.stat(file)
-               if stat and stat.uid == uid and stat.mode == mode then
+               if stat and stat.uid == uid and stat.modestr == mode then
                        return loadfile(file)
                end
        end