From: Jonathan Bennett Date: Sat, 14 Oct 2017 04:39:51 +0000 (-0500) Subject: luci-app-fwknop: Adds a check to not overwrite user configured keys X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2561f2a85ad65027c84aded1ab304c7e5d3d2902;p=oweals%2Fluci.git luci-app-fwknop: Adds a check to not overwrite user configured keys Signed-off-by: Jonathan Bennett [Tony Ambardar: backported from master branch 4b7a0085 ("luci-app-fwknop: Adds a check to not overwrite user configured keys")] Signed-off-by: Tony Ambardar --- diff --git a/applications/luci-app-fwknopd/Makefile b/applications/luci-app-fwknopd/Makefile index 3fbd88ad6..6df5a4740 100644 --- a/applications/luci-app-fwknopd/Makefile +++ b/applications/luci-app-fwknopd/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=Fwknopd config - web config for the firewall knock daemon LUCI_DEPENDS:=+fwknopd +qrencode PKG_VERSION:=1.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_LICENSE:=GPLv2 PKG_MAINTAINER:=Jonathan Bennett include ../../luci.mk diff --git a/applications/luci-app-fwknopd/root/etc/uci-defaults/40_luci-fwknopd b/applications/luci-app-fwknopd/root/etc/uci-defaults/40_luci-fwknopd index 65ef01245..9e5057e70 100644 --- a/applications/luci-app-fwknopd/root/etc/uci-defaults/40_luci-fwknopd +++ b/applications/luci-app-fwknopd/root/etc/uci-defaults/40_luci-fwknopd @@ -3,6 +3,7 @@ #-- Licensed to the public under the GNU General Public License v2. . /lib/functions/network.sh +[ "$(uci -q get fwknopd.@access[0].KEY)" != "CHANGEME" ] && exit 0 uci batch <