izaya/OC-PsychOS
2
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into fsdev

Browse Source
This commit is contained in:
Izaya 2017-09-15 19:47:55 +10:00
commit 8f80df31ea
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configs/minimal.cfg
View File

@ -15,7 +15,7 @@ modules/net/copper.lua
modules/util/motd.lua modules/util/motd.lua
modules/lib/readline.lua modules/lib/readline.lua
modules/lib/shutil.lua modules/lib/shutil.lua
modules/lib/sha256.lua libwrap sha modules/lib/sha256.lua
modules/net/net-ext.lua modules/net/net-ext.lua
modules/applications/login.lua modules/applications/login.lua
fwrap luash exec/luash.lua fwrap luash exec/luash.lua

2
modules/base/header.lua
View File

@ -124,12 +124,10 @@ do -- so local works
if not f then return false end if not f then return false end
local C=fs.readall(f) local C=fs.readall(f)
fs.close(f) fs.close(f)
log(C)
for line in C:gmatch("[^\n]+") do for line in C:gmatch("[^\n]+") do
local username,hpass,salt = line:match("(.+)\t(.+)\t(.+)") local username,hpass,salt = line:match("(.+)\t(.+)\t(.+)")
if username and hpass and salt then if username and hpass and salt then
ut[username] = {hpass,salt} ut[username] = {hpass,salt}
log(username,hpass,salt)
end end
end end
end end