From nobody Wed Dec 14 16:28:08 2022 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 4NXLQ01nnyz4jlDp for ; Wed, 14 Dec 2022 16:28:08 +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 4NXLQ006VJz3HdY for ; Wed, 14 Dec 2022 16:28:08 +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=1671035288; 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=uW5D0dYKHiE9xMiGSArmYlulV8z7qsi1yg4Sr+zBCZo=; b=FF3QbD5LZ/cdYkNuZAlnuTzg7MG8UHPLzqM4gmRvoa8bAWlVrTORBAH+QIj6W3GWS4QGXk 6T0NJMQbRlHdtfuWdhpTIGVZXxvwB0QtWM336qxlZ6JitOlJg0+HKwNNHhLk9ZjMF2OH+3 z4EidRhIDj5ou86OdpaGI9Yfc5GiACVYfz03kfp4EXb8AYLbb2Ks2IhUFI2FOHW7maeNhe xlkTBfdDo14PZxma1LXhiv4nDWm1R7+KULNvVEX3CpSHI75P2ENyHuSjkgeTB1ngrXxVmP QGUzQDZhXSQugeBosl6ij38Rx62mEedTPfgQZVb24cArf1cG3GLcFSiHeYM7FA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671035288; a=rsa-sha256; cv=none; b=a/VuCit7PzqFd+jjyVhoQgQHL/zC0FSLVuEGS+YFf9yToOGt3tH/aobxZHUuJ4v0WgsqxE FCqT2w9294PsKH1Ueu78+o60tdGZqvDzanavDzaQpNQOkXbIA8lR1dAqENH/eWJXVFjtNS 2j4lXhrdWaMBRw4kvIBl4/NCHTJwFt94PJb+9PPoONfccNeun8eWQY6tyyIr9D8DYcrerW M56QpN1Bwidgs8fk/OVQYGlBkRNTYgW8cW1V0ZftKqt4lHcb/s7oZdy18mSjZfr6wgiXBk tTRxac25pBJVc0RqDS7sj10WesHpfY2rMVYdz9B7xwT7Ze/19MC9fYXIpgyXdA== 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 4NXLPz6HYxz10sJ for ; Wed, 14 Dec 2022 16:28:07 +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 2BEGS7Kp081140 for ; Wed, 14 Dec 2022 16:28:07 GMT (envelope-from bugzilla-noreply@freebsd.org) Received: (from www@localhost) by kenobi.freebsd.org (8.15.2/8.15.2/Submit) id 2BEGS73T081139 for bugs@FreeBSD.org; Wed, 14 Dec 2022 16:28:07 GMT (envelope-from bugzilla-noreply@freebsd.org) X-Authentication-Warning: kenobi.freebsd.org: www 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, 14 Dec 2022 16:28:08 +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 Only Me X-Bugzilla-Who: emaste@freebsd.org X-Bugzilla-Status: Open X-Bugzilla-Resolution: X-Bugzilla-Priority: Normal 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 #5 from Ed Maste --- As comment #3 points out this conflict should have emitted a message and op= ened an editor; this may not be particularly user-friendly, and also as comment = #3 suggests we ought to check for "<<<<<<<" markers and refuse to continue unt= il they are addressed. That said, this 3-way diff resolution is best addressed by having freebsd-update use a tool (like etcmerge) rather than having built-in logic. --=20 You are receiving this mail because: You are the assignee for the bug.=