Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

openconnect: set config variable on teardown and correctly pass the password

Browse source 
This addresses https://dev.openwrt.org/ticket/16634

Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
This commit is contained in:
Nikos Mavrogiannopoulos 2014-08-31 23:57:47 +02:00
parent 3a78fe047a
commit e9215bf85d
3 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
net/openconnect/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=openconnect PKG_NAME:=openconnect
PKG_VERSION:=6.00 PKG_VERSION:=6.00
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=ftp://ftp.infradead.org/pub/openconnect/ PKG_SOURCE_URL:=ftp://ftp.infradead.org/pub/openconnect/
@ -56,6 +56,7 @@ define Package/openconnect/install
$(INSTALL_BIN) ./files/vpnc-script $(1)/lib/netifd/ $(INSTALL_BIN) ./files/vpnc-script $(1)/lib/netifd/
$(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/openconnect $(1)/usr/sbin/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/openconnect $(1)/usr/sbin/
$(INSTALL_BIN) ./files/openconnect-wrapper $(1)/usr/sbin/
endef endef
$(eval $(call BuildPackage,openconnect)) $(eval $(call BuildPackage,openconnect))

14
net/openconnect/files/openconnect-wrapper Executable file
View file

@ -0,0 +1,14 @@
#!/bin/sh
# This script wraps openconnect in order to obtain the password
# file from cmd.
# $1 password file
# $2... are passed to openconnect
test -z "$1" && exit 1
pwfile=$1
shift
cat $pwfile|/usr/sbin/openconnect $*

4
net/openconnect/files/openconnect.sh
View file

@ -55,13 +55,15 @@ proto_openconnect_setup() {
logger -t openconnect "executing 'openconnect $cmdline'" logger -t openconnect "executing 'openconnect $cmdline'"
if [ -f "$pwfile" ];then if [ -f "$pwfile" ];then
proto_run_command "$config" /usr/sbin/openconnect $cmdline <$pwfile proto_run_command "$config" /usr/sbin/openconnect-wrapper $pwfile $cmdline
else else
proto_run_command "$config" /usr/sbin/openconnect $cmdline proto_run_command "$config" /usr/sbin/openconnect $cmdline
fi fi
} }
proto_openconnect_teardown() { proto_openconnect_teardown() {
local config="$1"
pwfile="/var/run/openconnect-$config.passwd" pwfile="/var/run/openconnect-$config.passwd"
rm -f $pwfile rm -f $pwfile