From d427aff1a7c7902e6eade012956c5ec9060cc60b Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Thu, 28 Feb 2008 09:30:04 -0800
Subject: fix ssh allow-root template

Bugfix: 2909

1. Change name so telnet and ssh syntax are similar
2. Fix to always return true so update suceeds
3. No need to delete entry on removal of ssh service
---
 templates/service/ssh/allow-root/node.def   | 15 +++++++++++++++
 templates/service/ssh/root-allowed/node.def | 19 -------------------
 2 files changed, 15 insertions(+), 19 deletions(-)
 create mode 100644 templates/service/ssh/allow-root/node.def
 delete mode 100644 templates/service/ssh/root-allowed/node.def

diff --git a/templates/service/ssh/allow-root/node.def b/templates/service/ssh/allow-root/node.def
new file mode 100644
index 00000000..f476087d
--- /dev/null
+++ b/templates/service/ssh/allow-root/node.def
@@ -0,0 +1,15 @@
+type: bool
+default: false
+help: Enable/disable root login over ssh
+update: if [ \"$VAR(@)\" == \"true\" ]; then 
+		sudo ed - /etc/ssh/sshd_config <<-"EOF"
+		/^PermitRootLogin/s/no/yes/
+		wq
+		EOF
+	else
+		sudo ed - /etc/ssh/sshd_config <<-"EOF"
+		/^PermitRootLogin/s/yes/no/
+		wq
+		EOF
+	fi
+	/bin/true
diff --git a/templates/service/ssh/root-allowed/node.def b/templates/service/ssh/root-allowed/node.def
deleted file mode 100644
index 8c5a6fd9..00000000
--- a/templates/service/ssh/root-allowed/node.def
+++ /dev/null
@@ -1,19 +0,0 @@
-type: bool
-help: Allow root login over ssh
-default: false
-help: Enable/disable root login
-update: if [ \"$VAR(@)\" == \"true\" ]; then 
-		sudo ed - /etc/ssh/sshd_config <<-"EOF"
-		/^PermitRootLogin/s/no/yes/
-		wq
-		EOF
-	else
-		sudo ed - /etc/ssh/sshd_config <<-"EOF"
-		/^PermitRootLogin/s/yes/no/
-		wq
-		EOF
-	fi
-delete:	sudo ed - /etc/ssh/sshd_config <<-"EOF"
-	/^PermitRootLogin/s/yes/no/
-	wq
-	EOF
-- 
cgit v1.2.3