From 78bf9cc55463187751dd3a3838a6e96e18ffec23 Mon Sep 17 00:00:00 2001 From: Nikos Mavrogiannopoulos Date: Fri, 5 Dec 2014 20:27:45 +0100 Subject: [PATCH] openconnect: simplified cmdline appending Signed-off-by: Nikos Mavrogiannopoulos --- net/openconnect/files/openconnect.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/net/openconnect/files/openconnect.sh b/net/openconnect/files/openconnect.sh index 307e3a758..ca8fff97d 100755 --- a/net/openconnect/files/openconnect.sh +++ b/net/openconnect/files/openconnect.sh @@ -38,10 +38,16 @@ proto_openconnect_setup() { cmdline="$server$port -i vpn-$config --non-inter --syslog --script /lib/netifd/vpnc-script" - [ -f /etc/openconnect/ca-vpn-$config.pem ] && append cmdline "--no-system-trust --cafile /etc/openconnect/ca-vpn-$config.pem" [ -f /etc/openconnect/user-cert-vpn-$config.pem ] && append cmdline "-c /etc/openconnect/user-cert-vpn-$config.pem" [ -f /etc/openconnect/user-key-vpn-$config.pem ] && append cmdline "--sslkey /etc/openconnect/user-key-vpn-$config.pem" - [ -n "$serverhash" ] && append cmdline "--no-system-trust --servercert=$serverhash" + if test -f /etc/openconnect/ca-vpn-$config.pem;then + append cmdline "--cafile /etc/openconnect/ca-vpn-$config.pem" + append cmdline "--no-system-trust" + fi + if test -n "$serverhash";then + append cmdline " --servercert=$serverhash" + append cmdline "--no-system-trust" + fi [ -n "$authgroup" ] && append cmdline "--authgroup $authgroup" [ -n "$username" ] && append cmdline "-u $username" [ -n "$password" ] && {