summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2007-09-20 07:38:06 +0000
committerMike Frysinger <vapier@gentoo.org>2007-09-20 07:38:06 +0000
commit33102e02e7f7928339e171a4ff2dbd4eb5c31967 (patch)
tree29ba570a600fa5e954720ed375a5316ee3e634b7 /net-misc/openssh
parentstable x86, security bug 192818 (diff)
downloadgentoo-2-33102e02e7f7928339e171a4ff2dbd4eb5c31967.tar.gz
gentoo-2-33102e02e7f7928339e171a4ff2dbd4eb5c31967.tar.bz2
gentoo-2-33102e02e7f7928339e171a4ff2dbd4eb5c31967.zip
If restarting, check the config first #192825 by Hans-Werner Hilse.
(Portage version: 2.1.3.9)
Diffstat (limited to 'net-misc/openssh')
-rw-r--r--net-misc/openssh/ChangeLog5
-rw-r--r--net-misc/openssh/files/sshd.rc66
2 files changed, 9 insertions, 2 deletions
diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index ea037732ea14..a3d39d762109 100644
--- a/net-misc/openssh/ChangeLog
+++ b/net-misc/openssh/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-misc/openssh
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.263 2007/09/08 08:08:30 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.264 2007/09/20 07:38:05 vapier Exp $
+
+ 20 Sep 2007; Mike Frysinger <vapier@gentoo.org> files/sshd.rc6:
+ If restarting, check the config first #192825 by Hans-Werner Hilse.
08 Sep 2007; Markus Rothe <corsair@gentoo.org> openssh-4.7_p1-r1.ebuild:
Stable on ppc64; bug #191321
diff --git a/net-misc/openssh/files/sshd.rc6 b/net-misc/openssh/files/sshd.rc6
index 258c3a3f1baf..2a5d4ae259a4 100644
--- a/net-misc/openssh/files/sshd.rc6
+++ b/net-misc/openssh/files/sshd.rc6
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/files/sshd.rc6,v 1.22 2007/02/23 10:51:48 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/files/sshd.rc6,v 1.23 2007/09/20 07:38:06 vapier Exp $
opts="reload"
@@ -62,6 +62,10 @@ start() {
}
stop() {
+ if [ "${RC_CMD}" = "restart" ] ; then
+ checkconfig || return 1
+ fi
+
ebegin "Stopping ${SVCNAME}"
start-stop-daemon --stop --exec "${SSHD_BINARY}" \
--pidfile "${SSHD_PIDFILE}" --quiet