From: Jo-Philipp Wich <jow@openwrt.org>
Date: Wed, 5 Aug 2009 01:38:44 +0000 (+0000)
Subject: luci-0.9: merge r5193-r5194
X-Git-Tag: 0.9.0~137
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=9c07466806e6d07df21ab4c6c71a70b6d4a36df0;p=project%2Fluci.git

luci-0.9: merge r5193-r5194
---

diff --git a/contrib/package/olsrd-luci/files/etc/init.d/olsrd b/contrib/package/olsrd-luci/files/etc/init.d/olsrd
index 9072faebd6..875800e75c 100755
--- a/contrib/package/olsrd-luci/files/etc/init.d/olsrd
+++ b/contrib/package/olsrd-luci/files/etc/init.d/olsrd
@@ -30,7 +30,7 @@ validate_ifname() {
 
 validate_olsrd_option() {
 	local str=$1
-	[ -z "$str" -o "$str" != "${str%%[! 	0-9A-Za-z./:_-]*}" ] && return 1
+	[ -z "$str" -o "$str" != "${str%%[! 	0-9A-Za-z./|:_-]*}" ] && return 1
 	return 0
 }
 
diff --git a/libs/core/luasrc/ip.lua b/libs/core/luasrc/ip.lua
index 0a66804e8e..3b0ca6799b 100644
--- a/libs/core/luasrc/ip.lua
+++ b/libs/core/luasrc/ip.lua
@@ -17,11 +17,12 @@ $Id$
 --- LuCI IP calculation library.
 module( "luci.ip", package.seeall )
 
-require("bit")
-require("luci.util")
+require "nixio"
+local bit  = nixio.bit
+local util = require "luci.util"
 
 --- Boolean; true if system is little endian
-LITTLE_ENDIAN = not luci.util.bigendian()
+LITTLE_ENDIAN = not util.bigendian()
 
 --- Boolean; true if system is big endian
 BIG_ENDIAN    = not LITTLE_ENDIAN
@@ -324,7 +325,7 @@ end
 -- @class	module
 -- @cstyle	instance
 -- @name	luci.ip.cidr
-cidr = luci.util.class()
+cidr = util.class()
 
 --- Test whether the instance is a IPv4 address.
 -- @return	Boolean indicating a IPv4 address type