[Bug 185546] freebsd-update(8) can modify sshd and lock you out of your system
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 02 Mar 2023 20:51:28 UTC
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=185546
--- Comment #9 from commit-hook@FreeBSD.org ---
A commit in branch releng/13.2 references this bug:
URL:
https://cgit.FreeBSD.org/src/commit/?id=a6c6edbe9d37caf1dbc81f918adf8c1f451a534e
commit a6c6edbe9d37caf1dbc81f918adf8c1f451a534e
Author: Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2022-12-14 17:34:59 +0000
Commit: Ed Maste <emaste@FreeBSD.org>
CommitDate: 2023-03-02 20:50:57 +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)
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D37703
(cherry picked from commit ceb5f28ba5fcfa69de7410d2327d4a5abf2a421f)
(cherry picked from commit c7e3703352037a5afacdc4126725f351fe7da72b)
usr.sbin/freebsd-update/freebsd-update.sh | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
--
You are receiving this mail because:
You are the assignee for the bug.