diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-03-26 10:14:36 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-03-26 10:14:36 -0700 |
| commit | 084da99e245e2a83505aa6e509e67fd4d4783aa9 (patch) | |
| tree | 886ee4c3ab61261d76621d6fdb31154a8b325291 /templates | |
| parent | eaafe71089adc625777aedf008daa6143577693a (diff) | |
| parent | 3e0898170191abd168c5307e9338e1da0b6988d4 (diff) | |
| download | vyatta-cfg-quagga-084da99e245e2a83505aa6e509e67fd4d4783aa9.tar.gz vyatta-cfg-quagga-084da99e245e2a83505aa6e509e67fd4d4783aa9.zip | |
Merge branch 'jenner' of 192.168.100.1:git/vyatta-cfg-system into jenner
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/system/login/node.def | 2 | ||||
| -rw-r--r-- | templates/system/login/radius-server/node.def | 1 | ||||
| -rw-r--r-- | templates/system/login/tacacs-plus/node.def | 1 | ||||
| -rw-r--r-- | templates/system/login/user/node.def | 1 |
4 files changed, 2 insertions, 3 deletions
diff --git a/templates/system/login/node.def b/templates/system/login/node.def index 85d304c8..62e693e2 100644 --- a/templates/system/login/node.def +++ b/templates/system/login/node.def @@ -1 +1,3 @@ help: Set user access +delete:expression: "echo User root cannot be deleted 1>&2 && exit 1" +end: /opt/vyatta/sbin/vyatta_update_login.pl diff --git a/templates/system/login/radius-server/node.def b/templates/system/login/radius-server/node.def index f74cc568..137a92a0 100644 --- a/templates/system/login/radius-server/node.def +++ b/templates/system/login/radius-server/node.def @@ -4,4 +4,3 @@ help: Set radius server authentication commit:expression: $VAR(port) != "" && $VAR(secret) != "" && $VAR(timeout) != "" ; "Port, secret, and timeout must be specified for Radius" -end: /opt/vyatta/sbin/vyatta_update_radius.pl diff --git a/templates/system/login/tacacs-plus/node.def b/templates/system/login/tacacs-plus/node.def index 41eeb465..d8eab559 100644 --- a/templates/system/login/tacacs-plus/node.def +++ b/templates/system/login/tacacs-plus/node.def @@ -1,4 +1,3 @@ help: Set TACACS+ server authentication commit:expression: $VAR(server) != "" && $VAR(secret) != "" ; "One server and a secret must be specified for TACACS+" -end: /opt/vyatta/sbin/vyatta_update_tacacs.pl diff --git a/templates/system/login/user/node.def b/templates/system/login/user/node.def index b41b2ea3..d23a397f 100644 --- a/templates/system/login/user/node.def +++ b/templates/system/login/user/node.def @@ -7,4 +7,3 @@ commit:expression: $VAR(authentication/encrypted-password) != "" ; "user password must be specified" syntax:expression: pattern $VAR(@) "^[a-zA-Z_][a-zA-Z0-9_-]*\\$?$" ; "invalid user name $VAR(@)" -end: /opt/vyatta/sbin/vyatta_update_users.pl |