[gentoo-commits] gentoo-x86 commit in net-misc/openssh/files: sshd.rc6.2

[Mike Frysinger (vapier)]

vapier      11/05/28 16:57:48

  Modified:             sshd.rc6.2
  Log:
  Move custom opts to checkconfig and include those when verifying config sanity #367303 by Horst Prote.
  
  (Portage version: 2.2.0_alpha33/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  net-misc/openssh/files/sshd.rc6.2

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openssh/files/sshd.rc6.2?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openssh/files/sshd.rc6.2?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openssh/files/sshd.rc6.2?r1=1.1&r2=1.2

Index: sshd.rc6.2
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/openssh/files/sshd.rc6.2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sshd.rc6.2	24 Jan 2011 02:55:47 -0000	1.1
+++ sshd.rc6.2	28 May 2011 16:57:48 -0000	1.2
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/files/sshd.rc6.2,v 1.1 2011/01/24 02:55:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/files/sshd.rc6.2,v 1.2 2011/05/28 16:57:48 vapier Exp $
 
 opts="${opts} reload checkconfig gen_keys"
 
@@ -27,7 +27,12 @@
 
 	gen_keys || return 1
 
-	"${SSHD_BINARY}" -t ${myopts} || return 1
+	[ "${SSHD_PIDFILE}" != "/var/run/sshd.pid" ] \
+		&& SSHD_OPTS="${SSHD_OPTS} -o PidFile=${SSHD_PIDFILE}"
+	[ "${SSHD_CONFDIR}" != "/etc/ssh" ] \
+		&& SSHD_OPTS="${SSHD_OPTS} -f ${SSHD_CONFDIR}/sshd_config"
+
+	"${SSHD_BINARY}" -t ${SSHD_OPTS} || return 1
 }
 
 gen_key() {
@@ -50,17 +55,12 @@
 }
 
 start() {
-	local myopts=""
-	[ "${SSHD_PIDFILE}" != "/var/run/sshd.pid" ] \
-		&& myopts="${myopts} -o PidFile=${SSHD_PIDFILE}"
-	[ "${SSHD_CONFDIR}" != "/etc/ssh" ] \
-		&& myopts="${myopts} -f ${SSHD_CONFDIR}/sshd_config"
-
 	checkconfig || return 1
+
 	ebegin "Starting ${SVCNAME}"
 	start-stop-daemon --start --exec "${SSHD_BINARY}" \
 	    --pidfile "${SSHD_PIDFILE}" \
-	    -- ${myopts} ${SSHD_OPTS}
+	    -- ${SSHD_OPTS}
 	eend $?
 }