Merge branch 'sstp-rewrite' of github.com:c-po/vyos-1x into current

* 'sstp-rewrite' of github.com:c-po/vyos-1x:
  sstp: T2008: migrate SSL certificate nodes
  sstp: T2006: fix valueHelp and validators for numeric values
  sstp: T2008: remove req-limit config node
  sstp: T2110: use uniform RADIUS CLI syntax
  sstp: T2008: adjust config syntax to common style
  ntp: only import deepcopy from copy
  sstp: T2008: use pep8 formatting
  sstp: T2008: dns: unwind configuration
  sstp: T2008: move to vpn node
  sstp: T2007: fix MTU boundaries

1 files changed, 4 insertions, 6 deletions

diff --git a/src/conf_mode/ntp.py b/src/conf_mode/ntp.py
index f706d502f..c3e8d51b3 100755
--- a/src/conf_mode/ntp.py
+++ b/src/conf_mode/ntp.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2018 VyOS maintainers and contributors
+# Copyright (C) 2018-2020 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
@@ -13,15 +13,13 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
 
 import sys
 import os
-
 import jinja2
 import ipaddress
-import copy
+
+from copy import deepcopy
 
 from vyos.config import Config
 from vyos import ConfigError
@@ -78,7 +76,7 @@ default_config_data = {
 }
 
 def get_config():
-    ntp = copy.deepcopy(default_config_data)
+    ntp = deepcopy(default_config_data)
     conf = Config()
     if not conf.exists('system ntp'):
         return None