From nobody Wed Jun 21 12:58:50 2023 X-Original-To: bugs@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 4QmNqG4Jskz4g2K2 for ; Wed, 21 Jun 2023 12:58:50 +0000 (UTC) (envelope-from bugzilla-noreply@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 4QmNqG2J8gz4KQV for ; Wed, 21 Jun 2023 12:58:50 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687352330; 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: in-reply-to:in-reply-to:references:references; bh=Om0g/ZDE6sox6HciEohfQMyAK2FIbEM0wi8ImSqOFfY=; b=l7BHZiC391qm3QCU//yJNY5lihjBZdQP8ni+EVJWm+Xf3rLrKu7XNMx14+a6BWw47auHIx ecOIrshv8l3NoWTadHFAt+41BbYrDASvoAKrgj7oVsNrrwm+R6C8S33X4CXw5tOzvwnk5I K6E2AtOzDx3C/w4Uhyj/vgn/NSqlihhtIpC7MPD3+KWHzzR/KGjtthx8fpcf/d/5YGqZIn mYEDfNwcRnrxae3HrWj0FuXfQjIiLrumb2Y5bsEP2J3FhxpItQ5KrmftCajTrM/CcNYLPE z9Me4as+/1RPTMX90jFprB3rNrdhiqtvXutvG6nT0h2ecd8ov+GTkyfr2F2UIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687352330; a=rsa-sha256; cv=none; b=cJHPwKicuOoFteJEGUng8NDdwfmJ/waZUxfB2AdQSLCv2zmG9kNvUEWUXsyZJT0+yWWdrv C1OecUjrKHvg7wyYwwCgv4O1Ycs6mGNe2hdpZlSsx4AZT9Yq+mzbFcqI9bdxKSQTsUaZH9 T8KeSw1jXYEfLkxH9E7pi5Uz+AIuJk5dtzz67VC7MyVJKRLxxXj0MF1G6YESdUxHgjftku afFwqRx50cpBw7ND2icwzoIGLjX/Ml4cgPSjlBn7OgwLn5sPn9eDHh17eL/tZYq5XNWOkS SplfrJqN88EqfO+Ny15wwDXdTsp0MPTaPKgdwyiMjGfwOZEQ1KfUcBjDARFLOQ== Received: from kenobi.freebsd.org (kenobi.freebsd.org [IPv6:2610:1c1:1:606c::50:1d]) (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 4QmNqG1PWmzj3J for ; Wed, 21 Jun 2023 12:58:50 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from kenobi.freebsd.org ([127.0.1.5]) by kenobi.freebsd.org (8.15.2/8.15.2) with ESMTP id 35LCwoGd043828 for ; Wed, 21 Jun 2023 12:58:50 GMT (envelope-from bugzilla-noreply@freebsd.org) Received: (from bugzilla@localhost) by kenobi.freebsd.org (8.15.2/8.15.2/Submit) id 35LCwo1B043827 for bugs@FreeBSD.org; Wed, 21 Jun 2023 12:58:50 GMT (envelope-from bugzilla-noreply@freebsd.org) X-Authentication-Warning: kenobi.freebsd.org: bugzilla set sender to bugzilla-noreply@freebsd.org using -f From: bugzilla-noreply@freebsd.org To: bugs@FreeBSD.org Subject: [Bug 185546] freebsd-update(8) can modify sshd and lock you out of your system Date: Wed, 21 Jun 2023 12:58:50 +0000 X-Bugzilla-Reason: AssignedTo X-Bugzilla-Type: changed X-Bugzilla-Watch-Reason: None X-Bugzilla-Product: Base System X-Bugzilla-Component: bin X-Bugzilla-Version: 9.1-RELEASE X-Bugzilla-Keywords: X-Bugzilla-Severity: Affects Some People X-Bugzilla-Who: commit-hook@FreeBSD.org X-Bugzilla-Status: Closed X-Bugzilla-Resolution: FIXED X-Bugzilla-Priority: --- X-Bugzilla-Assigned-To: bugs@FreeBSD.org X-Bugzilla-Flags: X-Bugzilla-Changed-Fields: Message-ID: In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Bugzilla-URL: https://bugs.freebsd.org/bugzilla/ Auto-Submitted: auto-generated List-Id: Bug reports List-Archive: https://lists.freebsd.org/archives/freebsd-bugs List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-bugs@freebsd.org MIME-Version: 1.0 X-ThisMailContainsUnwantedMimeParts: N https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D185546 --- Comment #10 from commit-hook@FreeBSD.org --- A commit in branch stable/12 references this bug: URL: https://cgit.FreeBSD.org/src/commit/?id=3Dbb727917364f7ded1d24f599389288c63= b23d862 commit bb727917364f7ded1d24f599389288c63b23d862 Author: Ed Maste AuthorDate: 2022-12-14 17:34:59 +0000 Commit: Ed Maste CommitDate: 2023-06-21 12:58:01 +0000 freebsd-update: re-edit files if merge conflict markers remain freebsd-update will open ${EDITOR} if conflicts occur while merging updates to config files. Inform the user if they've left conflict markers behind, and go back to editing the file. PR: 185546 PR: 229689 Reviewed by: delphij Approved by: re (cperciva, expedited MFC) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D37703 (cherry picked from commit ceb5f28ba5fcfa69de7410d2327d4a5abf2a421f) (cherry picked from commit c7e3703352037a5afacdc4126725f351fe7da72b) (cherry picked from commit e27ded83c76a609687a3d9e82b80fe7e1b782bf6) (cherry picked from commit b562307b70346030f59fe6a05d125814c74da47b) usr.sbin/freebsd-update/freebsd-update.sh | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) --=20 You are receiving this mail because: You are the assignee for the bug.=