diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2011-05-28 16:57:48 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2011-05-28 16:57:48 +0000 |
| commit | ff0fe76356617d27bd78918b9378590a19312031 (patch) | |
| tree | c0b8fa87ea18aa122ed845bf2eac59caee48e2df /net-misc | |
| parent | alpha/sparc stable wrt #368495 (diff) | |
| download | gentoo-2-ff0fe76356617d27bd78918b9378590a19312031.tar.gz gentoo-2-ff0fe76356617d27bd78918b9378590a19312031.tar.bz2 gentoo-2-ff0fe76356617d27bd78918b9378590a19312031.zip | |
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)
Diffstat (limited to 'net-misc')
| -rw-r--r-- | net-misc/openssh/ChangeLog | 6 | ||||
| -rw-r--r-- | net-misc/openssh/files/sshd.rc6.2 | 18 |
2 files changed, 14 insertions, 10 deletions
diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog index bee34a458cc9..ef747aa767dc 100644 --- a/net-misc/openssh/ChangeLog +++ b/net-misc/openssh/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-misc/openssh # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.419 2011/05/16 00:52:24 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.420 2011/05/28 16:57:48 vapier Exp $ + + 28 May 2011; Mike Frysinger <vapier@gentoo.org> files/sshd.rc6.2: + Move custom opts to checkconfig and include those when verifying config + sanity #367303 by Horst Prote. 16 May 2011; Robin H. Johnson <robbat2@gentoo.org> openssh-5.8_p2.ebuild: Bug #366643: rediff the LPK patch for LDAP usage. Also merge the Mozilla uid diff --git a/net-misc/openssh/files/sshd.rc6.2 b/net-misc/openssh/files/sshd.rc6.2 index 86f87baa878d..8ce2fafa1a3e 100644 --- a/net-misc/openssh/files/sshd.rc6.2 +++ b/net-misc/openssh/files/sshd.rc6.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 @@ checkconfig() { 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 @@ gen_keys() { } 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 $? } |