From: Steven Barth <steven@midlink.org>
Date: Sat, 26 Apr 2008 21:59:45 +0000 (+0000)
Subject: * Minor bugfixes
X-Git-Tag: 0.8.0~1105
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f917c0bb6445794cc94ff895f430db84a9e77ea2;p=oweals%2Fluci.git

* Minor bugfixes
---

diff --git a/contrib/package/luci-splash/src/luci_splash.init b/contrib/package/luci-splash/src/luci_splash.init
index 150f846f2..10d6411d1 100644
--- 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 77d45cfb7..cde1877de 100644
--- 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