Merge pull request #470 from thesabbir/patch-01

merged 
modules/luci-mod-rpc: fix #466 #427 attempt to index global 'luci' (a nil value)
This commit is contained in:
Hannu Nyman 2015-09-17 11:47:54 +03:00
commit 7ead90bb26

View file

@ -49,10 +49,10 @@ function rpc_auth()
server.challenge = function(user, pass) server.challenge = function(user, pass)
local sid, token, secret local sid, token, secret
require "luci.config" local config = require "luci.config"
if sys.user.checkpasswd(user, pass) then if sys.user.checkpasswd(user, pass) then
local sdat = util.ubus("session", "create", { timeout = luci.config.sauth.sessiontime }) local sdat = util.ubus("session", "create", { timeout = config.sauth.sessiontime })
if sdat then if sdat then
sid = sdat.ubus_rpc_session sid = sdat.ubus_rpc_session
token = sys.uniqueid(16) token = sys.uniqueid(16)