From: John Crispin <john@openwrt.org>
Date: Mon, 30 Jun 2014 09:57:29 +0000 (+0000)
Subject: procd: fix uci_validation
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9912d02fa1d0e0f4a484180d23c812223bde7e11;p=librecmc%2Flibrecmc.git

procd: fix uci_validation

Regardles of the return code from validate_data _error variable will be 0 due
to 'local' command in the previous line. With this patch we are able to catch
the return code from validate_data tool.

Signed-off-by: Luka Perkov <luka@openwrt.org>

SVN-Revision: 41414
---

diff --git a/package/system/procd/Makefile b/package/system/procd/Makefile
index 6553fcc831..30bcd2a7f2 100644
--- a/package/system/procd/Makefile
+++ b/package/system/procd/Makefile
@@ -1,7 +1,14 @@
+#
+# Copyright (C) 2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=procd
-PKG_VERSION:=2014-06-19
+PKG_VERSION:=2014-06-27
 
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 
diff --git a/package/system/procd/files/procd.sh b/package/system/procd/files/procd.sh
index 67924a2749..c5fd512486 100644
--- a/package/system/procd/files/procd.sh
+++ b/package/system/procd/files/procd.sh
@@ -269,9 +269,10 @@ uci_validate_section()
 	local _package="$1"
 	local _type="$2"
 	local _name="$3"
+	local _result
 	local _error
 	shift; shift; shift
-	local _result=`/sbin/validate_data "$_package" "$_type" "$_name" "$@" 2> /dev/null`
+	_result=`/sbin/validate_data "$_package" "$_type" "$_name" "$@" 2> /dev/null`
 	_error=$?
 	eval "$_result"
 	[ "$_error" = "0" ] || `/sbin/validate_data "$_package" "$_type" "$_name" "$@" 1> /dev/null`