diff options
| -rw-r--r-- | interface-definitions/include/accel-ppp-mppe.xml.i | 7 | ||||
| -rwxr-xr-x | src/conf_mode/service_pppoe-server.py | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/interface-definitions/include/accel-ppp-mppe.xml.i b/interface-definitions/include/accel-ppp-mppe.xml.i index 089d8e2c1..b7f9cfd92 100644 --- a/interface-definitions/include/accel-ppp-mppe.xml.i +++ b/interface-definitions/include/accel-ppp-mppe.xml.i @@ -5,9 +5,6 @@ <completionHelp> <list>require prefer deny</list> </completionHelp> - <constraint> - <regex>(^require|prefer|deny)</regex> - </constraint> <valueHelp> <format>require</format> <description>send mppe request, if client rejects, drop the connection</description> @@ -20,6 +17,10 @@ <format>deny</format> <description>drop all mppe</description> </valueHelp> + <constraint> + <regex>^(require|prefer|deny)$</regex> + </constraint> </properties> + <defaultValue>prefer</defaultValue> </leafNode> <!-- included end --> diff --git a/src/conf_mode/service_pppoe-server.py b/src/conf_mode/service_pppoe-server.py index fb2cd5a26..f92569c20 100755 --- a/src/conf_mode/service_pppoe-server.py +++ b/src/conf_mode/service_pppoe-server.py @@ -100,8 +100,6 @@ def get_config(config=None): pppoe['authentication']['local_users']['username'][username] = dict_merge( default_values, pppoe['authentication']['local_users']['username'][username]) - import pprint - pprint.pprint(pppoe) return pppoe |