diff options
author | Christian Breunig <christian@breunig.cc> | 2024-01-04 11:17:27 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-01-04 11:17:27 +0100 |
commit | 598fed91068401d5ed259ea742820248d851d246 (patch) | |
tree | 14ad877fe86882f8325f6bda83471197aecc6c45 /src/conf_mode/vpn_sstp.py | |
parent | 1cc70ce273cbddb5ea9eb4148808c6c2aaf3d28f (diff) | |
parent | 706fdbb234202723e02f93ad8eb724649181a60a (diff) | |
download | vyos-1x-598fed91068401d5ed259ea742820248d851d246.tar.gz vyos-1x-598fed91068401d5ed259ea742820248d851d246.zip |
Merge pull request #2751 from vyos/mergify/bp/sagitta/pr-2750
configdict: T5894: add get_config_dict() flag with_pki (backport #2750)
Diffstat (limited to 'src/conf_mode/vpn_sstp.py')
-rwxr-xr-x | src/conf_mode/vpn_sstp.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/conf_mode/vpn_sstp.py b/src/conf_mode/vpn_sstp.py index ac053cc76..6bf9307e1 100755 --- a/src/conf_mode/vpn_sstp.py +++ b/src/conf_mode/vpn_sstp.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -# Copyright (C) 2018-2023 VyOS maintainers and contributors +# Copyright (C) 2018-2024 VyOS maintainers and contributors # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 or later as @@ -54,14 +54,11 @@ def get_config(config=None): return None # retrieve common dictionary keys - sstp = get_accel_dict(conf, base, sstp_chap_secrets) + sstp = get_accel_dict(conf, base, sstp_chap_secrets, with_pki=True) if dict_search('client_ip_pool', sstp): # Multiple named pools require ordered values T5099 sstp['ordered_named_pools'] = get_pools_in_order(dict_search('client_ip_pool', sstp)) - if sstp: - sstp['pki'] = conf.get_config_dict(['pki'], key_mangling=('-', '_'), - get_first_key=True, - no_tag_node_value_mangle=True) + sstp['server_type'] = 'sstp' return sstp |