Merge branch 'master' into fsdev
This commit is contained in:
commit
8f80df31ea
@ -15,7 +15,7 @@ modules/net/copper.lua
|
||||
modules/util/motd.lua
|
||||
modules/lib/readline.lua
|
||||
modules/lib/shutil.lua
|
||||
modules/lib/sha256.lua
|
||||
libwrap sha modules/lib/sha256.lua
|
||||
modules/net/net-ext.lua
|
||||
modules/applications/login.lua
|
||||
fwrap luash exec/luash.lua
|
||||
|
@ -124,12 +124,10 @@ do -- so local works
|
||||
if not f then return false end
|
||||
local C=fs.readall(f)
|
||||
fs.close(f)
|
||||
log(C)
|
||||
for line in C:gmatch("[^\n]+") do
|
||||
local username,hpass,salt = line:match("(.+)\t(.+)\t(.+)")
|
||||
if username and hpass and salt then
|
||||
ut[username] = {hpass,salt}
|
||||
log(username,hpass,salt)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
Loading…
Reference in New Issue
Block a user