mirror of
https://github.com/openwrt/packages.git
synced 2025-12-21 21:24:31 +04:00
openssh: fix killing of active sessions on shutdown
Starting with OpenSSH 9.8 sessions are handled by a separate binary called sshd-session Signed-off-by: Erik Karlsson <erik.karlsson@iopsys.eu>
This commit is contained in:
committed by
Michael Heimpold
parent
19e9dde02d
commit
3ac8092a39
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
|
|||||||
PKG_NAME:=openssh
|
PKG_NAME:=openssh
|
||||||
PKG_REALVERSION:=9.9p1
|
PKG_REALVERSION:=9.9p1
|
||||||
PKG_VERSION:=9.9_p1
|
PKG_VERSION:=9.9_p1
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=2
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_REALVERSION).tar.gz
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_REALVERSION).tar.gz
|
||||||
PKG_SOURCE_URL:=https://cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \
|
PKG_SOURCE_URL:=https://cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \
|
||||||
@@ -184,7 +184,7 @@ CONFIGURE_ARGS += \
|
|||||||
--with$(if $(CONFIG_OPENSSL_ENGINE),,out)-ssl-engine \
|
--with$(if $(CONFIG_OPENSSL_ENGINE),,out)-ssl-engine \
|
||||||
--with$(if $(CONFIG_OPENSSH_LIBFIDO2),,out)-security-key-builtin \
|
--with$(if $(CONFIG_OPENSSH_LIBFIDO2),,out)-security-key-builtin \
|
||||||
--with-cflags-after=-fzero-call-used-regs=skip
|
--with-cflags-after=-fzero-call-used-regs=skip
|
||||||
|
|
||||||
ifeq ($(BUILD_VARIANT),with-pam)
|
ifeq ($(BUILD_VARIANT),with-pam)
|
||||||
CONFIGURE_ARGS += \
|
CONFIGURE_ARGS += \
|
||||||
--with-pam
|
--with-pam
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ shutdown() {
|
|||||||
stop
|
stop
|
||||||
|
|
||||||
# kill active clients
|
# kill active clients
|
||||||
for pid in $(pidof sshd)
|
for pid in $(pidof sshd-session)
|
||||||
do
|
do
|
||||||
[ "$pid" = "$$" ] && continue
|
[ "$pid" = "$$" ] && continue
|
||||||
[ -e "/proc/$pid/stat" ] && kill $pid
|
[ -e "/proc/$pid/stat" ] && kill $pid
|
||||||
|
|||||||
Reference in New Issue
Block a user