diff options
Diffstat (limited to 'python/vyos')
| -rw-r--r-- | python/vyos/configdict.py | 5 | ||||
| -rw-r--r-- | python/vyos/template.py | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/python/vyos/configdict.py b/python/vyos/configdict.py index 62df3334c..db17c33fc 100644 --- a/python/vyos/configdict.py +++ b/python/vyos/configdict.py @@ -455,6 +455,11 @@ def get_accel_dict(config, base, chap_secrets): dict['authentication']['radius']['server'][server] = dict_merge( default_values, dict['authentication']['radius']['server'][server]) + # Check option "disable-accounting" per server and replace default value from '1813' to '0' + # set vpn sstp authentication radius server x.x.x.x disable-accounting + if 'disable_accounting' in dict['authentication']['radius']['server'][server]: + dict['authentication']['radius']['server'][server]['acct_port'] = '0' + # Add individual local-user default values if vyos_dict_search('authentication.local_users.username', dict): default_values = defaults(base + ['authentication', 'local-users', 'username']) diff --git a/python/vyos/template.py b/python/vyos/template.py index c88ab04a0..1f1ddc000 100644 --- a/python/vyos/template.py +++ b/python/vyos/template.py @@ -131,7 +131,7 @@ def vyos_address_from_cidr(text): Example: 192.0.2.0/24 -> 192.0.2.0, 2001:db8::/48 -> 2001:db8:: """ - return ip_network(text).network_address + return str(ip_network(text).network_address) @register_filter("netmask_from_cidr") @@ -140,4 +140,4 @@ def vyos_netmask_from_cidr(text): Example: 192.0.2.0/24 -> 255.255.255.0, 2001:db8::/48 -> ffff:ffff:ffff:: """ - return ip_network(text).netmask + return str(ip_network(text).netmask) |