Update init.d script to allow for multiple instances by Marius Mauch #114996.

Package-Manager: portage-2.0.53

3 files changed, 26 insertions, 21 deletions

diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index 7bd45bc19748..0439f5ec26a2 100644
--- a/net-misc/openssh/ChangeLog
+++ b/net-misc/openssh/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-misc/openssh
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.141 2005/10/22 13:22:35 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.142 2005/12/10 02:41:08 vapier Exp $
+
+  10 Dec 2005; Mike Frysinger <vapier@gentoo.org> files/sshd.rc6:
+  Update init.d script to allow for multiple instances by Marius Mauch #114996.
 
   22 Oct 2005; MATSUU Takuto <matsuu@gentoo.org> openssh-4.2_p1.ebuild:
   Stable on sh for #109678.
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 3935bd6d5da8..c3d9908a24fb 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 d76656ca5fb70736f711b9cf651184cb ChangeLog 23362
+MD5 664eedd666fb1d217d337087afc88e78 ChangeLog 23509
 MD5 2fc26aef45c8705e6da5e3fe6650af47 files/digest-openssh-3.8.1_p1-r1 219
 MD5 1c2b632d1118068966049ae41b33c012 files/digest-openssh-3.9_p1-r3 281
 MD5 c92c33beb73a2d008cb3744ebd7e4f88 files/digest-openssh-4.0_p1-r2 360
@@ -39,7 +39,7 @@ MD5 9cf3a0fb4e8709dde06bd4a3c61eeaff files/openssh-4.2_p1-sftplogging-1.4-gentoo
 MD5 eca7ba0b23754a710b42a79c1fb5e248 files/openssh-securid-1.3.1-updates.patch 445
 MD5 b86ae0c43a704c4ee2abd2ce5c955f8f files/sshd.pam 294
 MD5 2b66f75047edfac5d5e6cdbffa35383e files/sshd.pam_include 205
-MD5 5afc89edd73f522a5b3757a518dffb34 files/sshd.rc6 1293
+MD5 a0e3088a437e10b3fc27c60744a1be52 files/sshd.rc6 1468
 MD5 02a1e50ab3fa841edec86694bd71c8d1 metadata.xml 1251
 MD5 3af6afd052caef27a0707c9b941d41c6 openssh-3.8.1_p1-r1.ebuild 4407
 MD5 007223c0520d91c52557714c4bc6b0ca openssh-3.9_p1-r3.ebuild 5010
@@ -49,7 +49,7 @@ MD5 382ea44225fa43f758589017555e8859 openssh-4.2_p1.ebuild 5276
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDdr3BgIKl8Uu19MoRAteVAJ9pba6oFKFU0V8d8dIJWZavIflZQACfbMEQ
-oj1ilRy39oK3qOyYGdEKIcU=
-=hj9b
+iD8DBQFDmkEBgIKl8Uu19MoRAmYcAJ4q81W2A/Oa6vpW8SAZ6uSxgM3h+QCdEZ2g
++NtTfPSX42dkMGLKe8MFZ9Y=
+=QQyG
 -----END PGP SIGNATURE-----
diff --git a/net-misc/openssh/files/sshd.rc6 b/net-misc/openssh/files/sshd.rc6
index 01083d1d0fc6..c70c187823b1 100644
--- a/net-misc/openssh/files/sshd.rc6
+++ b/net-misc/openssh/files/sshd.rc6
@@ -1,20 +1,22 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 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.16 2005/08/21 19:09:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/files/sshd.rc6,v 1.17 2005/12/10 02:41:08 vapier Exp $
 
 depend() {
 	use logger dns
 	need net
 }
 
+[[ -z ${SSH_CONFDIR} ]] && SSH_CONFDIR="/etc/ssh"
+
 checkconfig() {
-	if [ ! -d /var/empty ] ; then
+	if [[ ! -d /var/empty ]] ; then
 		mkdir -p /var/empty || return 1
 	fi
 
-	if [ ! -e /etc/ssh/sshd_config ] ; then
-		eerror "You need an /etc/ssh/sshd_config file to run sshd"
+	if [[ ! -e ${SSH_CONFDIR}/sshd_config ]] ; then
+		eerror "You need an ${SSH_CONFDIR}/sshd_config file to run sshd"
 		eerror "There is a sample file in  /usr/share/doc/openssh"
 		return 1
 	fi
@@ -25,30 +27,30 @@ checkconfig() {
 }
 
 gen_keys() {
-	if [ ! -e /etc/ssh/ssh_host_key ] ; then
+	if [[ ! -e ${SSH_CONFDIR}/ssh_host_key ]] ; then
 		einfo "Generating Hostkey..."
-		/usr/bin/ssh-keygen -t rsa1 -b 1024 -f /etc/ssh/ssh_host_key -N '' || return 1
+		/usr/bin/ssh-keygen -t rsa1 -b 1024 -f ${SSH_CONFDIR}/ssh_host_key -N '' || return 1
 	fi
-	if [ ! -e /etc/ssh/ssh_host_dsa_key ] ; then
+	if [[ ! -e ${SSH_CONFDIR}/ssh_host_dsa_key ]] ; then
 		einfo "Generating DSA-Hostkey..."
-		/usr/bin/ssh-keygen -d -f /etc/ssh/ssh_host_dsa_key -N '' || return 1
+		/usr/bin/ssh-keygen -d -f ${SSH_CONFDIR}/ssh_host_dsa_key -N '' || return 1
 	fi
-	if [ ! -e /etc/ssh/ssh_host_rsa_key ] ; then
+	if [[ ! -e ${SSH_CONFDIR}/ssh_host_rsa_key ]] ; then
 		einfo "Generating RSA-Hostkey..."
-		/usr/bin/ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -N '' || return 1
+		/usr/bin/ssh-keygen -t rsa -f ${SSH_CONFDIR}/ssh_host_rsa_key -N '' || return 1
 	fi
 	return 0
 }
 
 start() {
 	checkconfig || return 1
-	ebegin "Starting sshd"
-	/usr/sbin/sshd
+	ebegin "Starting ${SVCNAME}"
+	/usr/sbin/sshd -o PidFile=/var/run/${SVCNAME}.pid ${SSHD_OPTS}
 	eend $?
 }
 
 stop() {
-	ebegin "Stopping sshd"
-	start-stop-daemon --stop --quiet --pidfile /var/run/sshd.pid
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon --stop --quiet --pidfile /var/run/${SVCNAME}.pid
 	eend $?
 }