diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2010-03-16 14:14:00 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2010-03-16 14:14:00 +0000 |
| commit | 0a077a30634c71e2eb0360e4278c2fcb3071909e (patch) | |
| tree | 8fea0f143517dfb1cf2450773b71bc743068bd5e | |
| parent | f4d459a10fb28f89cc0b39874b65c6d360dff250 (diff) | |
| download | aports-0a077a30634c71e2eb0360e4278c2fcb3071909e.tar.bz2 aports-0a077a30634c71e2eb0360e4278c2fcb3071909e.tar.xz | |
Revert "main/openssh: kill current ssh sessions on stop"
This reverts commit ae99c382f78b1582b1528c2ce03570605c845503.
| -rw-r--r-- | main/openssh/APKBUILD | 4 | ||||
| -rw-r--r-- | main/openssh/sshd.initd | 10 |
2 files changed, 3 insertions, 11 deletions
diff --git a/main/openssh/APKBUILD b/main/openssh/APKBUILD index bbc0d164cb..87d996e974 100644 --- a/main/openssh/APKBUILD +++ b/main/openssh/APKBUILD @@ -2,7 +2,7 @@ pkgname=openssh pkgver=5.4_p1 _myver=${pkgver%_*}${pkgver#*_} -pkgrel=1 +pkgrel=0 pkgdesc="Port of OpenBSD's free SSH release" url="http://www.openssh.org/portable.html" license="as-is" @@ -63,5 +63,5 @@ client() { } md5sums="da10af8a789fa2e83e3635f3a1b76f5e openssh-5.4p1.tar.gz -e11f44a4c47135484ac750d52855f846 sshd.initd +d993cc91e9fab6c6012390874c28af0a sshd.initd b35e9f3829f4cfca07168fcba98749c7 sshd.confd" diff --git a/main/openssh/sshd.initd b/main/openssh/sshd.initd index 149b0ecef6..34852c4e31 100644 --- a/main/openssh/sshd.initd +++ b/main/openssh/sshd.initd @@ -63,7 +63,6 @@ start() { } stop() { - local rc= if [ "${RC_CMD}" = "restart" ] ; then checkconfig || return 1 fi @@ -71,14 +70,7 @@ stop() { ebegin "Stopping ${SVCNAME}" start-stop-daemon --stop --exec "${SSHD_BINARY}" \ --pidfile "${SSHD_PIDFILE}" --quiet - rc=$? - eend $rc - - if [ "${RC_CMD}" = "stop" ]; then - # kill sessions on shutdown but not on restart - killall -q sshd & - fi - return $rc + eend $? } reload() { |