X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Finit.d%2Fssh;h=f832b712166190c750435e2003696155705d1953;hb=258084a279ed5d08a8697b855d5453fa0c2be167;hp=6fdc08deb8c7020cdb5c87cb9d2bd7f96aa4c536;hpb=913dcbf0e054931ce93568a4b87971601d6d1745;p=grml-etc.git

diff --git a/etc/init.d/ssh b/etc/init.d/ssh
index 6fdc08d..f832b71 100755
--- a/etc/init.d/ssh
+++ b/etc/init.d/ssh
@@ -1,16 +1,23 @@
-#!/bin/sh
+#! /bin/sh
 
 ### BEGIN INIT INFO
 # Provides:		sshd
 # Required-Start:	$remote_fs $syslog
 # Required-Stop:	$remote_fs $syslog
 # Default-Start:	2 3 4 5
-# Default-Stop:		1
+# Default-Stop:
 # Short-Description:	OpenBSD Secure Shell server
 ### END INIT INFO
 
-# Notice: this file has been adjusted by the Grml team so
-# the script supports key-generation for ssh
+# Notice: this file has been slightly adjusted by the
+# Grml team so the script supports key-generation
+
+# Configurable options:
+KEYGEN=/usr/bin/ssh-keygen
+RSA1_KEY=/etc/ssh/ssh_host_key
+RSA_KEY=/etc/ssh/ssh_host_rsa_key
+DSA_KEY=/etc/ssh/ssh_host_dsa_key
+ECDSA_KEY=/etc/ssh/ssh_host_ecdsa_key
 
 set -e
 
@@ -19,29 +26,18 @@ set -e
 test -x /usr/sbin/sshd || exit 0
 ( /usr/sbin/sshd -\? 2>&1 | grep -q OpenSSH ) 2>/dev/null || exit 0
 
-export SSHD_OOM_ADJUST=-17
+umask 022
+
 if test -f /etc/default/ssh; then
     . /etc/default/ssh
 fi
 
-# Are we in a virtual environment that doesn't support modifying
-# /proc/self/oom_adj?
-if grep -q 'envID:.*[1-9]' /proc/self/status; then
-    unset SSHD_OOM_ADJUST
-fi
-
 . /lib/lsb/init-functions
 
 if [ -n "$2" ]; then
     SSHD_OPTS="$SSHD_OPTS $2"
 fi
 
-# Configurable options:
-KEYGEN=/usr/bin/ssh-keygen
-RSA1_KEY=/etc/ssh/ssh_host_key
-RSA_KEY=/etc/ssh/ssh_host_rsa_key
-DSA_KEY=/etc/ssh/ssh_host_dsa_key
-
 # Are we running from init?
 run_by_init() {
     ([ "$previous" ] && [ "$runlevel" ]) || [ "$runlevel" = S ]
@@ -49,12 +45,12 @@ run_by_init() {
 
 check_for_no_start() {
     # forget it if we're trying to start, and /etc/ssh/sshd_not_to_be_run exists
-    if [ -e /etc/ssh/sshd_not_to_be_run ]; then 
+    if [ -e /etc/ssh/sshd_not_to_be_run ]; then
 	if [ "$1" = log_end_msg ]; then
-	    log_end_msg 0
+	    log_end_msg 0 || true
 	fi
 	if ! run_by_init; then
-	    log_action_msg "OpenBSD Secure Shell server not in use (/etc/ssh/sshd_not_to_be_run)"
+	    log_action_msg "OpenBSD Secure Shell server not in use (/etc/ssh/sshd_not_to_be_run)" || true
 	fi
 	exit 0
     fi
@@ -66,7 +62,7 @@ check_dev_null() {
 	    log_end_msg 1 || true
 	fi
 	if ! run_by_init; then
-	    log_action_msg "/dev/null is not a character device!"
+	    log_action_msg "/dev/null is not a character device!" || true
 	fi
 	exit 1
     fi
@@ -86,6 +82,29 @@ check_config() {
     fi
 }
 
+
+generate_ssh_keys() {
+    if ! test -f $RSA1_KEY ; then
+	log_action_msg "Generating SSH1 RSA host key..."
+	$KEYGEN -t rsa1 -f $RSA1_KEY -C '' -N '' || exit 1
+    fi
+
+    if ! test -f $RSA_KEY ; then
+	log_action_msg "Generating SSH2 RSA host key..."
+	$KEYGEN -t rsa -f $RSA_KEY -C '' -N '' || exit 1
+    fi
+
+    if ! test -f $DSA_KEY ; then
+	log_action_msg "Generating SSH2 DSA host key..."
+	$KEYGEN -t dsa -f $DSA_KEY -C '' -N '' || exit 1
+    fi
+
+    if ! test -f "$ECDSA_KEY" && grep -q "$ECDSA_KEY" /etc/ssh/sshd_config ; then
+	log_action_msg "Generating SSH2 ECDSA host key..."
+	$KEYGEN -t ecdsa -f "$ECDSA_KEY" -C '' -N '' || exit 1
+    fi
+}
+
 export PATH="${PATH:+$PATH:}/usr/sbin:/sbin"
 
 case "$1" in
@@ -93,91 +112,77 @@ case "$1" in
 	check_privsep_dir
 	check_for_no_start
 	check_dev_null
-
-	if ! test -f $RSA1_KEY ; then
-	   log_action_msg "Generating SSH1 RSA host key..."
-	   $KEYGEN -t rsa1 -f $RSA1_KEY -C '' -N '' || exit 1
-	fi
-
-	if ! test -f $RSA_KEY ; then
-	   log_action_msg "Generating SSH RSA host key..."
-	   $KEYGEN -t rsa -f $RSA_KEY -C '' -N '' || exit 1
-	fi
-
-	if ! test -f $DSA_KEY ; then
-	   log_action_msg "Generating SSH2 DSA host key..."
-	   $KEYGEN -t dsa -f $DSA_KEY -C '' -N '' || exit 1
-	fi
-
-	log_daemon_msg "Starting OpenBSD Secure Shell server" "sshd"
+        generate_ssh_keys
+	log_daemon_msg "Starting OpenBSD Secure Shell server" "sshd" || true
 	if start-stop-daemon --start --quiet --oknodo --pidfile /var/run/sshd.pid --exec /usr/sbin/sshd -- $SSHD_OPTS; then
-	    log_end_msg 0
+	    log_end_msg 0 || true
 	else
-	    log_end_msg 1
+	    log_end_msg 1 || true
 	fi
 	;;
   stop)
-	log_daemon_msg "Stopping OpenBSD Secure Shell server" "sshd"
+	log_daemon_msg "Stopping OpenBSD Secure Shell server" "sshd" || true
 	if start-stop-daemon --stop --quiet --oknodo --pidfile /var/run/sshd.pid; then
-	    log_end_msg 0
+	    log_end_msg 0 || true
 	else
-	    log_end_msg 1
+	    log_end_msg 1 || true
 	fi
 	;;
 
   reload|force-reload)
 	check_for_no_start
 	check_config
-	log_daemon_msg "Reloading OpenBSD Secure Shell server's configuration" "sshd"
+        generate_ssh_keys
+	log_daemon_msg "Reloading OpenBSD Secure Shell server's configuration" "sshd" || true
 	if start-stop-daemon --stop --signal 1 --quiet --oknodo --pidfile /var/run/sshd.pid --exec /usr/sbin/sshd; then
-	    log_end_msg 0
+	    log_end_msg 0 || true
 	else
-	    log_end_msg 1
+	    log_end_msg 1 || true
 	fi
 	;;
 
   restart)
 	check_privsep_dir
 	check_config
-	log_daemon_msg "Restarting OpenBSD Secure Shell server" "sshd"
+        generate_ssh_keys
+	log_daemon_msg "Restarting OpenBSD Secure Shell server" "sshd" || true
 	start-stop-daemon --stop --quiet --oknodo --retry 30 --pidfile /var/run/sshd.pid
 	check_for_no_start log_end_msg
 	check_dev_null log_end_msg
 	if start-stop-daemon --start --quiet --oknodo --pidfile /var/run/sshd.pid --exec /usr/sbin/sshd -- $SSHD_OPTS; then
-	    log_end_msg 0
+	    log_end_msg 0 || true
 	else
-	    log_end_msg 1
+	    log_end_msg 1 || true
 	fi
 	;;
 
   try-restart)
 	check_privsep_dir
 	check_config
-	log_daemon_msg "Restarting OpenBSD Secure Shell server" "sshd"
-	set +e
-	start-stop-daemon --stop --quiet --retry 30 --pidfile /var/run/sshd.pid
-	RET="$?"
-	set -e
+        generate_ssh_keys
+	log_daemon_msg "Restarting OpenBSD Secure Shell server" "sshd" || true
+	RET=0
+	start-stop-daemon --stop --quiet --retry 30 --pidfile /var/run/sshd.pid || RET="$?"
 	case $RET in
 	    0)
 		# old daemon stopped
 		check_for_no_start log_end_msg
 		check_dev_null log_end_msg
 		if start-stop-daemon --start --quiet --oknodo --pidfile /var/run/sshd.pid --exec /usr/sbin/sshd -- $SSHD_OPTS; then
-		    log_end_msg 0
+		    log_end_msg 0 || true
 		else
-		    log_end_msg 1
+		    log_end_msg 1 || true
 		fi
 		;;
 	    1)
 		# daemon not running
-		log_progress_msg "(not running)"
-		log_end_msg 0
+		log_progress_msg "(not running)" || true
+		log_end_msg 0 || true
 		;;
 	    *)
 		# failed to stop
-		log_progress_msg "(failed to stop)"
-		log_end_msg 1
+		log_progress_msg "(failed to stop)" || true
+		log_end_msg 1 || true
 		;;
 	esac
 	;;
@@ -187,10 +192,8 @@ case "$1" in
 	;;
 
   *)
-	log_action_msg "Usage: /etc/init.d/ssh {start|stop|reload|force-reload|restart|try-restart|status}"
+	log_action_msg "Usage: /etc/init.d/ssh {start|stop|reload|force-reload|restart|try-restart|status}" || true
 	exit 1
 esac
 
 exit 0
-
-## END OF FILE #################################################################