If restarting, check the config first #192825 by Hans-Werner Hilse.

Package-Manager: portage-2.1.3.9

3 files changed, 27 insertions, 10 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/Manifest b/net-misc/openssh/Manifest
index 78f3baa35660..d38792928606 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX openssh-3.9_p1-opensc.patch 3242 RMD160 9c382109f0a64c30d6404f6c6ecdd274b8114fd3 SHA1 1020a213c5acb479003bebe6e4bed0f5b1e56a9f SHA256 36f27a6cd277cf08fadbc23cd4d019def69f40a601d75e63ead7bdc7cdf0539b
 MD5 9ee2f24c97fb3bac6b9281c01aebd672 files/openssh-3.9_p1-opensc.patch 3242
 RMD160 9c382109f0a64c30d6404f6c6ecdd274b8114fd3 files/openssh-3.9_p1-opensc.patch 3242
@@ -62,10 +65,10 @@ AUX sshd.pam_include.1 205 RMD160 3051b92836a496c7c431f41585de688f7c9f51a7 SHA1
 MD5 480ed3c58a7cfbb8d1f3bca057af1eb9 files/sshd.pam_include.1 205
 RMD160 3051b92836a496c7c431f41585de688f7c9f51a7 files/sshd.pam_include.1 205
 SHA256 3185075821bb1f76cdc584c28f690a7338f8db5489d5fce73fe4bcbbfd3dfbfa files/sshd.pam_include.1 205
-AUX sshd.rc6 2046 RMD160 68df8ff7933b7a232882b2a6140fe1a2637609b6 SHA1 c3f74dbd764d570f69e60f18a081f19e3cefb037 SHA256 6569cb934cb1d5b9016c2828ff8c79b5c8477dd27b7078c609445cfc16692e9e
-MD5 c3acc27dddafb1e8c6d437e668e08c25 files/sshd.rc6 2046
-RMD160 68df8ff7933b7a232882b2a6140fe1a2637609b6 files/sshd.rc6 2046
-SHA256 6569cb934cb1d5b9016c2828ff8c79b5c8477dd27b7078c609445cfc16692e9e files/sshd.rc6 2046
+AUX sshd.rc6 2114 RMD160 e7e863b74a6020cacb66dffa11bbbd65a16a981d SHA1 2f119b21235c11317929bbaf10c00086a8f1995e SHA256 5322ab65851fb206baa6f45dc182c6d79f4a58c60cbceeb9c5a1562ff4fa5d76
+MD5 f71564ffab359faead63717920c3086b files/sshd.rc6 2114
+RMD160 e7e863b74a6020cacb66dffa11bbbd65a16a981d files/sshd.rc6 2114
+SHA256 5322ab65851fb206baa6f45dc182c6d79f4a58c60cbceeb9c5a1562ff4fa5d76 files/sshd.rc6 2114
 DIST openssh-4.4p1+SecurID_v1.3.2.patch 48240 RMD160 45d5734f7e65709cce581f1f85c06f60a73b825b SHA1 10bece428f6f36a0bb59b8fe9b9fb4321b544fa5 SHA256 189ad59139d86e5c808650add131af20ade00439713c3abcfac9a4e53580a196
 DIST openssh-4.4p1+x509-5.5.1.diff.gz 137417 RMD160 34cf39583e8c01bb055671a540c7463f45134960 SHA1 091e7499726fce527afeb66fffaf6ee48f4ac4bb SHA256 bb2936a0c5ffff2f5db41a7da83390a189dc4590f9a95325c252d81b9b693ded
 DIST openssh-4.4p1-hpn12v13.diff.gz 15392 RMD160 b057f9a1068ddce106a94465953bdac58d0ffac8 SHA1 00a677a7dd75c98db14a91814da49b8fd7b7d814 SHA256 2e3c6a108072eb9de3330cda8639b8c54845174e3a4691a895d06d5cbf221245
@@ -116,10 +119,10 @@ EBUILD openssh-4.7_p1-r1.ebuild 4694 RMD160 81b8226531b5e4cc295244d28a23e497f7ba
 MD5 b1c4f14328037aedb4acc452b2baf4de openssh-4.7_p1-r1.ebuild 4694
 RMD160 81b8226531b5e4cc295244d28a23e497f7ba6366 openssh-4.7_p1-r1.ebuild 4694
 SHA256 8091da95b508ca4182ad436fef3fc85444e5bcf2be478ac8ee79d71b14dad41e openssh-4.7_p1-r1.ebuild 4694
-MISC ChangeLog 41379 RMD160 afb4a0605495bcf4fbb8d6f3495fa04cf043b909 SHA1 19ef251067e494e2255a5ae89d34c6e1efebc27d SHA256 1177a67c5a55d83802845e21d893343c2564fca66f4c2cd642c178fc8d675b88
-MD5 8cad1f7a4b3c211b7de02bb1dd49e46f ChangeLog 41379
-RMD160 afb4a0605495bcf4fbb8d6f3495fa04cf043b909 ChangeLog 41379
-SHA256 1177a67c5a55d83802845e21d893343c2564fca66f4c2cd642c178fc8d675b88 ChangeLog 41379
+MISC ChangeLog 41515 RMD160 411d81b316363015a175558944f42aa691795e47 SHA1 59315119ac429d94671890740502270907da8ed7 SHA256 3a8d383d350c6d4baf5788b8ae03d4d9231bd0ffb767c9d151f58cebee76f5f1
+MD5 fb6cf9dda02a916453bc300f611d90bb ChangeLog 41515
+RMD160 411d81b316363015a175558944f42aa691795e47 ChangeLog 41515
+SHA256 3a8d383d350c6d4baf5788b8ae03d4d9231bd0ffb767c9d151f58cebee76f5f1 ChangeLog 41515
 MISC metadata.xml 1150 RMD160 4b6c978959df7998b2d7b22ea9dee0fbc9b37fc5 SHA1 2b319d9ed51a8a7a30d37bd4ad55484704355b31 SHA256 ad8ada6ce7414bd3ce222b80899c15998026c7184524b15cb0a8f18097a52d5c
 MD5 21157ed8184cb229572a983dd217ab86 metadata.xml 1150
 RMD160 4b6c978959df7998b2d7b22ea9dee0fbc9b37fc5 metadata.xml 1150
@@ -148,3 +151,10 @@ SHA256 21cd53d18dc04f1321b2e9e948befdd8bb705dc8c3e9d4678d5c643e7bba5ec6 files/di
 MD5 b486d84bc44687e803f2d29012b67db9 files/digest-openssh-4.7_p1-r1 1051
 RMD160 bd41b3872476464626a642bbdcdcf5b5118e705d files/digest-openssh-4.7_p1-r1 1051
 SHA256 253e98134458d55c12e0dd8ed32aca21c5234726a58d960814547cf934eaf686 files/digest-openssh-4.7_p1-r1 1051
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFG8iNjp/wUKkr7RBoRAjZfAJ0VN8nrA4XS5ujO3VKrDLGRaiL2RgCcDVUR
+KuDSr88NCRdhFip8GZKjl8Q=
+=WD32
+-----END PGP SIGNATURE-----
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