From nobody Sat Dec 10 05:01:04 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NTbM44x9wz4kb1G; Sat, 10 Dec 2022 05:01:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NTbM44Qrxz3H75; Sat, 10 Dec 2022 05:01:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670648464; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l4+v/X3kgLzPIalIeIc57xPX08DHpcoQKW0bGodc5Pg=; b=tqdzQinL68WmT9tRxxyyo2J869sSMLnRNcAVYQTW9uM3L8Q17PPS6jAexFR7gHnWW8abgX jAvcE5XXfvRN0s0e2KYpqz85KGFBEGJlB67LKbig6NL3u9vqWLSVEveKnEVdK3aNOyUdSx UbD5k4uUzIBmv+VRBtjZ7oM3c5nwb5foNmSj10mVLgcVDMLpE1ULf/RHk2CfsKGAZ8HfUc S9rwTQGUIyo9x21y2Wj1SnCK8dBb/XQHxvGgpgthi+FoZdDyuboHmiU6optVIiUjZhgyBW Ebql6IeBKlMRzvMrBOuMy0Kab7ftnDl+xv4DmvEba4wqL5/cyZjcEbzjKHhM2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670648464; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l4+v/X3kgLzPIalIeIc57xPX08DHpcoQKW0bGodc5Pg=; b=lWRHjBCNQdlJTxrEV8982osGb8VH+GyvnRXY1+eqnPRCWvfQTBuaSFUtYjlt1V97QLUTSY HzTGAU5j/DLjGBMMm2CywhawFfqXLv4k3l3pgjmhvTdtsRgbl/Zj4iNLLEHhhQ4RyRHqsP YpzKTH1JhQ5vFltjziY1dkBZO8BN08DNV12ZmsQYuhuEwbU+VrPwuUqT7flqHxeMROCULj hcK7Run3wlEHSq7wV0JqaOk2tv0EixnjbfU+igyBEcTK8NbtnQn2akf0YvYqcX7gyVnXvc 3rb55z1/DmqLlkx042WKipyaJzDC13cV/M85gPCytDFnLJGkOQzt+ewEMFAGtg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670648464; a=rsa-sha256; cv=none; b=ENeTgDq52k1xiGPWri20ybKH4MT2yWWhZZx2ixNibgAQ/iMw8ICWYEnNe2eXyMc9pU/fIF qywN7JvC3Daj17Sk+0WmQwULd8PEvFq1qp+1Zyv+LR6vvHxV5kVP2ei6Zt3IbM5/T451LQ cl/QuoLb8nBpgOHenuy5rJwCZfoMCPbCCo3J7vyafrrOQwuVLPOWKuDChxDRpzH5PL9SVA TFpOddHNkJw12ITuhcG2WFC32Yzeq6q0C9upD/2y7Zs3rmMR3z6FlO6DVSqCXaVBD/R/vx nbwQjfzHC6dDyAJ8VJx89MBfppgk+54RrWDlYvP924W//dkJnesDjUbpoPghwg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NTbM43Kd1z13pC; Sat, 10 Dec 2022 05:01:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2BA514gZ026518; Sat, 10 Dec 2022 05:01:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BA514Ac026517; Sat, 10 Dec 2022 05:01:04 GMT (envelope-from git) Date: Sat, 10 Dec 2022 05:01:04 GMT Message-Id: <202212100501.2BA514Ac026517@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: b296e60ed35e - stable/13 - freebsd-update: restart sshd after upgrade List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b296e60ed35ef9936dbe673e4966da439841b320 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=b296e60ed35ef9936dbe673e4966da439841b320 commit b296e60ed35ef9936dbe673e4966da439841b320 Author: Ed Maste AuthorDate: 2022-05-02 17:16:19 +0000 Commit: Eugene Grosbein CommitDate: 2022-12-10 04:56:24 +0000 freebsd-update: restart sshd after upgrade Sometimes the parent-child sshd protocol changes during an upgrade, and when this happens sshd will not accept new connections until it is restarted. PR: 263489 Reviewed by: kevans, gjb MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D35109 (cherry picked from commit 6cd1bc53160973fc421c59f66aaa7e4b37a8cebe) --- usr.sbin/freebsd-update/freebsd-update.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh index 9743cd652d16..078043326115 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -3023,6 +3023,14 @@ Kernel updates have been installed. Please reboot and run install_from_index INDEX-NEW || return 1 install_delete INDEX-OLD INDEX-NEW || return 1 + # Restart sshd if running (PR263489). Note that this does not + # affect child sshd processes handling existing sessions. + if service sshd status >/dev/null 2>/dev/null; then + echo + echo "Restarting sshd after upgrade" + service sshd restart + fi + # Rehash certs if we actually have certctl installed. if which certctl>/dev/null; then env DESTDIR=${BASEDIR} certctl rehash