Merge pull request #304 from nmav/ocserv-crypt

luci-app-ocserv: uclibc's crypt() doesn't support sha2crypt

diff --combined applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua
index 8cf35b7,2e530c0..c4be181
--- 1/applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua
--- 2/applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua
+++ b/applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua
@@@ -30,7 -30,7 +30,7 @@@ function pwd.write(self, section, value
                pass = value
        else
                local t = tonumber(nixio.getpid()*os.time())
-               local salt = "$5$" .. t .. "$"
+               local salt = "$1$" .. t .. "$"
                pass = nixio.crypt(value, salt)
        end
        Value.write(self, section, pass)
@@@ -47,7 -47,7 +47,7 @@@ if fd then local l
                if not ln then break end
  
                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
                        table.insert(lusers, {id, user, group, vpn_ip, ip, device, time, cipher, status})
                end