Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #393 from nmav/no-group-match

Browse source 
luci-app-ocserv: list users with no group
This commit is contained in:
Hannu Nyman 2015-08-31 11:20:29 +03:00
commit c0e2255ae9
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
applications/luci-app-ocserv/luasrc/controller/ocserv.lua
View file

@ -44,7 +44,7 @@ function ocserv_status()
if not ln then break end if not ln then break end
local id, user, group, vpn_ip, ip, device, time, cipher, status = local id, user, group, vpn_ip, ip, device, time, cipher, status =
ln:match("^%s*(%d+)%s+([-_%w]+)%s+([%.%*-_%w]+)%s+([%:%.-_%w]+)%s+([%:%.-_%w]+)%s+([%:%.-_%w]+)%s+([%:%.-_%w]+)%s+([%(%)%:%.-_%w]+)%s+([%:%.-_%w]+).*") ln:match("^%s*(%d+)%s+([-_%w]+)%s+([%(%)%.%*-_%w]+)%s+([%:%.-_%w]+)%s+([%:%.-_%w]+)%s+([%:%.-_%w]+)%s+([%:%.-_%w]+)%s+([%(%)%:%.-_%w]+)%s+([%:%.-_%w]+).*")
if id then if id then
fwd[#fwd+1] = { fwd[#fwd+1] = {
id = id, id = id,

2
applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua
View file

@ -47,7 +47,7 @@ if fd then local ln
if not ln then break end if not ln then break end
local id, user, group, vpn_ip, ip, device, time, cipher, status = local id, user, group, vpn_ip, ip, device, time, cipher, status =
ln:match("^%s*(%d+)%s+([-_%w]+)%s+([%.%*-_%w]+)%s+([%:%.-_%w]+)%s+([%:%.-_%w]+)%s+([%:%.-_%w]+)%s+([%:%.-_%w]+)%s+([%(%)%:%.-_%w]+)%s+([%:%.-_%w]+).*") ln:match("^%s*(%d+)%s+([-_%w]+)%s+([%(%)%.%*-_%w]+)%s+([%:%.-_%w]+)%s+([%:%.-_%w]+)%s+([%:%.-_%w]+)%s+([%:%.-_%w]+)%s+([%(%)%:%.-_%w]+)%s+([%:%.-_%w]+).*")
if id then if id then
table.insert(lusers, {id, user, group, vpn_ip, ip, device, time, cipher, status}) table.insert(lusers, {id, user, group, vpn_ip, ip, device, time, cipher, status})
end end