6 files changed, 3 insertions, 11 deletions
diff --git a/templates/system/login/node.def b/templates/system/login/node.def
index 62e693e2..66ac660c 100644
--- a/templates/system/login/node.def
+++ b/templates/system/login/node.def
@@ -1,3 +1,2 @@
 help: Set user access
-delete:expression: "echo User root cannot be deleted 1>&2 && exit 1"
-end: /opt/vyatta/sbin/vyatta_update_login.pl
+delete: echo 'User root cannot be deleted' 1>&2; exit 1
diff --git a/templates/system/login/radius-server/node.def b/templates/system/login/radius-server/node.def
index 137a92a0..f74cc568 100644
--- a/templates/system/login/radius-server/node.def
+++ b/templates/system/login/radius-server/node.def
@@ -4,3 +4,4 @@ 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/tacplus-server/node.def b/templates/system/login/tacplus-server/node.def
deleted file mode 100644
index 7fe9cc27..00000000
--- a/templates/system/login/tacplus-server/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-tag:
-type: txt
-help: Set TACACS+ server IP addresses
-commit:expression: $VAR(secret) != "" ; "secret must be specified for TACACS+"
diff --git a/templates/system/login/tacplus-server/node.tag/secret/node.def b/templates/system/login/tacplus-server/node.tag/secret/node.def
deleted file mode 100644
index 0f673ae2..00000000
--- a/templates/system/login/tacplus-server/node.tag/secret/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: txt
-help: Set TACACS+ secret
diff --git a/templates/system/login/tacplus-server/node.tag/timeout/node.def b/templates/system/login/tacplus-server/node.tag/timeout/node.def
deleted file mode 100644
index 8ce5f585..00000000
--- a/templates/system/login/tacplus-server/node.tag/timeout/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-type: u32
-help: Set TACACS+ server connection timeout in seconds
-default: 3
diff --git a/templates/system/login/user/node.def b/templates/system/login/user/node.def
index d23a397f..26625b7f 100644
--- a/templates/system/login/user/node.def
+++ b/templates/system/login/user/node.def
@@ -7,3 +7,4 @@ 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_login.pl