diff --git a/backend3/openvpn-server b/backend3/openvpn-server --- a/backend3/openvpn-server +++ b/backend3/openvpn-server @@ -432,11 +432,6 @@ read_server_config() else write_bool_param lzo false fi - if grep -qs '^ncp-disable' "$IFACESDIR/$dev/$OVPNCONFIG";then - write_bool_param ncp_disable true - else - write_bool_param ncp_disable false - fi if get_config_val "$dev" proto | grep -qs '^tcp';then write_bool_param use_tcp true else @@ -465,7 +460,6 @@ read_server_config() write_string_param type "$type" write_string_param port '1194' write_bool_param lzo false - write_bool_param ncp_disable false write_bool_param use_tcp false if [ "$type" = 'routed' ];then write_string_param server_netmask '255.255.255.0' @@ -793,7 +787,6 @@ SERVER_CONF_TEMPLATE [ -n "$in_digests" ] && echo "auth $in_digests" >> $CACHEDIR/$dev/$OVPNCONFIG test_bool "$in_lzo" && echo 'comp-lzo' >>"$CACHEDIR/$dev/$OVPNCONFIG" - test_bool "$in_ncp_disable" && echo 'ncp-disable' >>"$CACHEDIR/$dev/$OVPNCONFIG" if is_gost x509 "$CERTSDIR/$servername.cert"; then local engine=gost diff --git a/ui/openvpn-server/ajax.scm b/ui/openvpn-server/ajax.scm --- a/ui/openvpn-server/ajax.scm +++ b/ui/openvpn-server/ajax.scm @@ -39,7 +39,7 @@ (form-update-enum "bridge" (woo-list "/openvpn-server/avail_bridges")) (form-update-value-list '("enabled" "type" "bridge" "port" "server_net" "server_netmask" "vpnnet" "vpnnetmask" - "gateway_vpnaddr" "vpnpool_start" "vpnpool_end" "lzo" "use_tcp" "ciphers" "tls_ciphers" "digests" "ncp_disable" "dhparams") + "gateway_vpnaddr" "vpnpool_start" "vpnpool_end" "lzo" "use_tcp" "ciphers" "tls_ciphers" "digests" "dhparams") cmd) (update-type-interface))) @@ -65,7 +65,7 @@ 'operation reason (form-value-list '("enabled" "type" "bridge" "port" "server_net" "server_netmask" "vpnnet" "vpnnetmask" - "gateway_vpnaddr" "vpnpool_start" "vpnpool_end" "lzo" "use_tcp" "language" "ciphers" "tls_ciphers" "digests" "ncp_disable" "dhparams")))))) + "gateway_vpnaddr" "vpnpool_start" "vpnpool_end" "lzo" "use_tcp" "language" "ciphers" "tls_ciphers" "digests" "dhparams")))))) (define (add-network) (write-config "add-server-network") diff --git a/ui/openvpn-server/index.html b/ui/openvpn-server/index.html --- a/ui/openvpn-server/index.html +++ b/ui/openvpn-server/index.html @@ -77,13 +77,6 @@