cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-30 15:38:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11798 from GuLinux/patch-1

Browse Source 
openconnect: Allow to set `usergroup` option
This commit is contained in:
Nikos Mavrogiannopoulos
2020-05-01 13:39:03 +02:00
committed by GitHub
parent fe38ef3472 6464166660
commit 5782406697
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/openconnect/Makefile
+1 -1
View File
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=openconnect
PKG_VERSION:=8.05
PKG_RELEASE:=2
PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=ftp://ftp.infradead.org/pub/openconnect/
net/openconnect/README
+2
View File
@@ -12,6 +12,8 @@ config interface 'MYVPN'
option serverhash 'AE7FF6A0426F0A0CD0A02EB9EC3C5066FAEB0B25'
option defaultroute '0'
option authgroup 'DEFAULT'
# usergroup option, if required by some servers
# option usergroup 'USERGROUP'
# For second factor auth:
net/openconnect/files/openconnect.sh
+3 -1
View File
@@ -19,6 +19,7 @@ proto_openconnect_init_config() {
proto_config_add_string "username"
proto_config_add_string "serverhash"
proto_config_add_string "authgroup"
proto_config_add_string "usergroup"
proto_config_add_string "password"
proto_config_add_string "password2"
proto_config_add_string "token_mode"
@@ -38,7 +39,7 @@ proto_openconnect_add_form_entry() {
proto_openconnect_setup() {
local config="$1"
json_get_vars server port interface username serverhash authgroup password password2 token_mode token_secret token_script os csd_wrapper mtu juniper form_entry
json_get_vars server port interface username serverhash authgroup usergroup password password2 token_mode token_secret token_script os csd_wrapper mtu juniper form_entry
grep -q tun /proc/modules || insmod tun
ifname="vpn-$config"
@@ -77,6 +78,7 @@ proto_openconnect_setup() {
append_args --no-system-trust
}
[ -n "$authgroup" ] && append_args --authgroup "$authgroup"
[ -n "$usergroup" ] && append_args --usergroup "$usergroup"
[ -n "$username" ] && append_args -u "$username"
[ -n "$password" ] || [ "$token_mode" = "script" ] && {
umask 077