Merge pull request #1080 from ffainelli/openconnect
openconnect: allow specifying os, csd-wrapper and no-cert-check
This commit is contained in:
commit
67232bbd66
1 changed files with 5 additions and 1 deletions
|
@ -13,6 +13,8 @@ proto_openconnect_init_config() {
|
||||||
proto_config_add_string "token_mode"
|
proto_config_add_string "token_mode"
|
||||||
proto_config_add_string "token_secret"
|
proto_config_add_string "token_secret"
|
||||||
proto_config_add_string "interface"
|
proto_config_add_string "interface"
|
||||||
|
proto_config_add_string "os"
|
||||||
|
proto_config_add_string "csd_wrapper"
|
||||||
no_device=1
|
no_device=1
|
||||||
available=1
|
available=1
|
||||||
}
|
}
|
||||||
|
@ -20,7 +22,7 @@ proto_openconnect_init_config() {
|
||||||
proto_openconnect_setup() {
|
proto_openconnect_setup() {
|
||||||
local config="$1"
|
local config="$1"
|
||||||
|
|
||||||
json_get_vars server port username serverhash authgroup password interface token_mode token_secret
|
json_get_vars server port username serverhash authgroup password interface token_mode token_secret os csd_wrapper
|
||||||
|
|
||||||
grep -q tun /proc/modules || insmod tun
|
grep -q tun /proc/modules || insmod tun
|
||||||
|
|
||||||
|
@ -68,6 +70,8 @@ proto_openconnect_setup() {
|
||||||
|
|
||||||
[ -n "$token_mode" ] && append cmdline "--token-mode=$token_mode"
|
[ -n "$token_mode" ] && append cmdline "--token-mode=$token_mode"
|
||||||
[ -n "$token_secret" ] && append cmdline "--token-secret=$token_secret"
|
[ -n "$token_secret" ] && append cmdline "--token-secret=$token_secret"
|
||||||
|
[ -n "$os" ] && append cmdline "--os=$os"
|
||||||
|
[ -n "$csd_wrapper" ] && [ -x "$csd_wrapper" ] && append cmdline "--csd-wrapper=$csd_wrapper"
|
||||||
|
|
||||||
proto_export INTERFACE="$config"
|
proto_export INTERFACE="$config"
|
||||||
logger -t openconnect "executing 'openconnect $cmdline'"
|
logger -t openconnect "executing 'openconnect $cmdline'"
|
||||||
|
|
Loading…
Reference in a new issue