Fix a bug preventing login in non-shadow environments
This commit is contained in:
parent
fb2f4af1fb
commit
07a8c9c43d
1 changed files with 11 additions and 5 deletions
|
@ -440,11 +440,17 @@ function user.checkpasswd(username, password)
|
|||
local pwd = account.passwd
|
||||
local shadowpw
|
||||
if #pwd == 1 then
|
||||
for l in io.lines("/etc/shadow") do
|
||||
shadowpw = l:match("^%s:([^:]+)" % username)
|
||||
if shadowpw then
|
||||
pwd = shadowpw
|
||||
break
|
||||
if luci.fs.stat("/etc/shadow") then
|
||||
if not pcall(function()
|
||||
for l in io.lines("/etc/shadow") do
|
||||
shadowpw = l:match("^%s:([^:]+)" % username)
|
||||
if shadowpw then
|
||||
pwd = shadowpw
|
||||
break
|
||||
end
|
||||
end
|
||||
end) then
|
||||
return nil, "Unable to access shadow-file"
|
||||
end
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in a new issue