libs/sys: workaround broken entries in /proc/net/ipv6_route, observed on brcm-2.4

[project/luci.git] / libs / sys / luasrc / sys.lua

diff --git a/libs/sys/luasrc/sys.lua b/libs/sys/luasrc/sys.lua
index 7906d2b..b8a1c50 100644 (file)
--- a/libs/sys/luasrc/sys.lua
+++ b/libs/sys/luasrc/sys.lua
@@ -451,35 +451,42 @@ function net.routes6(callback)
                                "([a-f0-9]+) +([^%s]+)"
                        )
 
-                       src_ip = luci.ip.Hex(
-                               src_ip, tonumber(src_prefix, 16), luci.ip.FAMILY_INET6, false
-                       )
-
-                       dst_ip = luci.ip.Hex(
-                               dst_ip, tonumber(dst_prefix, 16), luci.ip.FAMILY_INET6, false
-                       )
-
-                       nexthop = luci.ip.Hex( nexthop, 128, luci.ip.FAMILY_INET6, false )
-
-                       local rt = {
-                               source   = src_ip,
-                               dest     = dst_ip,
-                               nexthop  = nexthop,
-                               metric   = tonumber(metric, 16),
-                               refcount = tonumber(refcnt, 16),
-                               usecount = tonumber(usecnt, 16),
-                               flags    = tonumber(flags, 16),
-                               device   = dev,
-
-                               -- lua number is too small for storing the metric
-                               -- add a metric_raw field with the original content
-                               metric_raw = metric
-                       }
+                       if dst_ip and dst_prefix and
+                          src_ip and src_prefix and
+                          nexthop and metric and
+                          refcnt and usecnt and
+                          flags and dev
+                       then
+                               src_ip = luci.ip.Hex(
+                                       src_ip, tonumber(src_prefix, 16), luci.ip.FAMILY_INET6, false
+                               )
+
+                               dst_ip = luci.ip.Hex(
+                                       dst_ip, tonumber(dst_prefix, 16), luci.ip.FAMILY_INET6, false
+                               )
+
+                               nexthop = luci.ip.Hex( nexthop, 128, luci.ip.FAMILY_INET6, false )
+
+                               local rt = {
+                                       source   = src_ip,
+                                       dest     = dst_ip,
+                                       nexthop  = nexthop,
+                                       metric   = tonumber(metric, 16),
+                                       refcount = tonumber(refcnt, 16),
+                                       usecount = tonumber(usecnt, 16),
+                                       flags    = tonumber(flags, 16),
+                                       device   = dev,
+
+                                       -- lua number is too small for storing the metric
+                                       -- add a metric_raw field with the original content
+                                       metric_raw = metric
+                               }
 
-                       if callback then
-                               callback(rt)
-                       else
-                               routes[#routes+1] = rt
+                               if callback then
+                                       callback(rt)
+                               else
+                                       routes[#routes+1] = rt
+                               end
                        end
                end
 
@@ -596,13 +603,14 @@ user.getuser = nixio.getpw
 --- Retrieve the current user password hash.
 -- @param username     String containing the username to retrieve the password for
 -- @return                     String containing the hash or nil if no password is set.
+-- @return                     Password database entry
 function user.getpasswd(username)
        local pwe = nixio.getsp and nixio.getsp(username) or nixio.getpw(username)
        local pwh = pwe and (pwe.pwdp or pwe.passwd)
        if not pwh or #pwh < 1 or pwh == "!" or pwh == "x" then
-               return nil
+               return nil, pwe
        else
-               return pwh
+               return pwh, pwe
        end
 end
 
@@ -611,12 +619,11 @@ end
 -- @param pass         String containing the password to compare
 -- @return                     Boolean indicating wheather the passwords are equal
 function user.checkpasswd(username, pass)
-       local pwh = user.getpasswd(username)
-       if pwh and nixio.crypt(pass, pwh) ~= pwh then
-               return false
-       else
-               return true
+       local pwh, pwe = user.getpasswd(username)
+       if pwe then
+               return (pwh == nil or nixio.crypt(pass, pwh) == pwh)
        end
+       return false
 end
 
 --- Change the password of given user.
@@ -795,7 +802,7 @@ end
 -- @return             Numeric index value
 function init.index(name)
        if fs.access(init.dir..name) then
-               return call("env -i sh -c 'source %s%s; exit $START' >/dev/null"
+               return call("env -i sh -c 'source %s%s enabled; exit ${START:-255}' >/dev/null"
                        %{ init.dir, name })
        end
 end