SOURCES: opensshd.init - use functions

[glen]

Author: glen                         Date: Thu Oct 12 21:56:13 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- use functions

---- Files affected:
SOURCES:
   opensshd.init (1.28 -> 1.29) 

---- Diffs:

================================================================
Index: SOURCES/opensshd.init
diff -u SOURCES/opensshd.init:1.28 SOURCES/opensshd.init:1.29
--- SOURCES/opensshd.init:1.28	Tue May 30 13:40:40 2006
+++ SOURCES/opensshd.init	Thu Oct 12 23:56:08 2006
@@ -32,10 +32,7 @@
 	/usr/sbin/sshd -t || exit 1
 }
 
-RETVAL=0
-# See how we were called.
-case "$1" in
-  start)
+start() {
 	# generate new keys with empty passwords if they do not exist
 	if [ ! -f /etc/ssh/ssh_host_key -o ! -s /etc/ssh/ssh_host_key ]; then
 		/usr/bin/ssh-keygen -t rsa1 -f /etc/ssh/ssh_host_key -N '' 1>&2
@@ -70,8 +67,9 @@
 	else
 		msg_already_running OpenSSH
 	fi
-	;;
-  stop)
+}
+
+stop() {
 	if [ -f /var/lock/subsys/sshd ]; then
 		msg_stopping OpenSSH
 		# we use start-stop-daemon to stop sshd, as it is unacceptable for such
@@ -82,12 +80,21 @@
 	else
 		msg_not_running OpenSSH
 	fi
+}
+
+RETVAL=0
+# See how we were called.
+case "$1" in
+  start)
+  	start
+	;;
+  stop)
+  	stop
 	;;
   restart)
 	checkconfig
-	$0 stop
-	$0 start
-	exit $?
+	stop
+	start
 	;;
   status)
 	status sshd
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/opensshd.init?r1=1.28&r2=1.29&f=u