* Minor bugfixes

diff --git a/contrib/package/luci-splash/src/luci_splash.init b/contrib/package/luci-splash/src/luci_splash.init
index 150f846f2fff229348016793c115bd4f04895ef7..10d6411d12dfb696946ce541665f80e24d282f31 100644 (file)
--- a/contrib/package/luci-splash/src/luci_splash.init
+++ b/contrib/package/luci-splash/src/luci_splash.init
@@ -61,7 +61,7 @@ start() {
        iptables -t nat -A luci_splash_leases -j DROP
        
        ### Start the splash httpd
-       httpd -c /etc/luci_splash_httpd.conf -p 8082 -h /usr/lib/luci_splash/htdocs
+       httpd -c /etc/luci_splash_httpd.conf -p 8082 -h /usr/lib/luci-splash/htdocs
        
        ### Sync leases
        /usr/lib/luci-splash/sync.lua

diff --git a/core/src/ffluci/sys.lua b/core/src/ffluci/sys.lua
index 77d45cfb7a0d18a425a79c12710c556b397c682b..cde1877deda7dd484427c4d9bb103d0cd5098c0b 100644 (file)
--- a/core/src/ffluci/sys.lua
+++ b/core/src/ffluci/sys.lua
@@ -121,8 +121,8 @@ function net.arptable()
 end
 
 -- Returns whether an IP-Adress belongs to a certain net
-function net.belongs(ip, net, prefix)
-       return (net.ip4bin(ip):sub(1, prefix) == net.ip4bin(net):sub(1, prefix))
+function net.belongs(ip, ipnet, prefix)
+       return (net.ip4bin(ip):sub(1, prefix) == net.ip4bin(ipnet):sub(1, prefix))
 end
 
 -- Returns all available network interfaces