[arch-commits] Commit in openssh/trunk (PKGBUILD sshd.close-sessions)

[Gaetan Bisson]

    Date: Tuesday, March 20, 2012 @ 03:01:02
  Author: bisson
Revision: 153862

better fix FS#17389

Modified:
  openssh/trunk/PKGBUILD
  openssh/trunk/sshd.close-sessions

---------------------+
 PKGBUILD            |    4 ++--
 sshd.close-sessions |    9 ++++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-03-20 06:22:25 UTC (rev 153861)
+++ PKGBUILD	2012-03-20 07:01:02 UTC (rev 153862)
@@ -5,7 +5,7 @@
 
 pkgname=openssh
 pkgver=5.9p1
-pkgrel=7
+pkgrel=8
 pkgdesc='Free version of the SSH connectivity tools'
 arch=('i686' 'x86_64')
 license=('custom:BSD')
@@ -19,7 +19,7 @@
         'sshd.pam'
         'sshd')
 sha1sums=('ac4e0055421e9543f0af5da607a72cf5922dcc56'
-          '3e8efad4578bbeb8f9788432758c69dc2b303c1c'
+          '954bf1660aa32620c37034320877f4511b767ccb'
           'ec102deb69cad7d14f406289d2fc11fee6eddbdd'
           '3413909fd45a28701c92e6e5b59c6b65346ddb0f'
           '21fa88de6cc1c7912e71655f50896ba17991a1c2')

Modified: sshd.close-sessions
===================================================================
--- sshd.close-sessions	2012-03-20 06:22:25 UTC (rev 153861)
+++ sshd.close-sessions	2012-03-20 07:01:02 UTC (rev 153862)
@@ -1,13 +1,16 @@
 # Close sshd sessions before shutting down the network; see FS#17389.
 
 sshd_close_sessions () {
+	if ck_daemon sshd; then
+		return
+	fi
 	/etc/rc.d/sshd stop
 	stat_busy "Stopping Secure Shell Sessions"
 	for i in $(pgrep sshd); do
-		if readlink -q /proc/$i/exe &>/dev/null | grep -q '^/usr/sbin/sshd'; then
-			kill $i &>/dev/null
+		if readlink -q /proc/$i/exe | grep -q '^/usr/sbin/sshd'; then
+			kill $i
 		fi
-	done
+	done &>/dev/null
 	stat_done
 }