From b85d3be8d70caf9533bfa283643173e74eafcf0a Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Thu, 9 Jun 2022 19:02:02 +0200 Subject: sstp: T4444: merge of defaultValue already done in get_accel_dict() --- src/conf_mode/vpn_sstp.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'src/conf_mode') diff --git a/src/conf_mode/vpn_sstp.py b/src/conf_mode/vpn_sstp.py index c2dc97caf..23e5162ba 100755 --- a/src/conf_mode/vpn_sstp.py +++ b/src/conf_mode/vpn_sstp.py @@ -28,7 +28,6 @@ from vyos.template import render from vyos.util import call from vyos.util import dict_search from vyos.util import write_file -from vyos.xml import defaults from vyos import ConfigError from vyos import airbag airbag.enable() @@ -52,15 +51,10 @@ def get_config(config=None): # retrieve common dictionary keys sstp = get_accel_dict(conf, base, sstp_chap_secrets) - - default_values = defaults(base) - sstp = dict_merge(default_values, sstp) - # workaround a "know limitation" - https://phabricator.vyos.net/T2665 - del sstp['authentication']['local_users']['username']['static_ip'] - if sstp: sstp['pki'] = conf.get_config_dict(['pki'], key_mangling=('-', '_'), - get_first_key=True, no_tag_node_value_mangle=True) + get_first_key=True, + no_tag_node_value_mangle=True) return sstp -- cgit v1.2.3