[Bug 185546] freebsd-update(8) can modify sshd and lock you out of your system

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=185546 --- Comment #10 from commit-h...@freebsd.org --- A commit in branch stable/12 references this bug: URL: https://cgit.FreeBSD.org/src/commit/?id=bb727917364f7ded1d24f599389288c63b23d862 commit bb727917364f7ded1d24f599389288c63b23d862 Author

[Bug 185546] freebsd-update(8) can modify sshd and lock you out of your system

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=185546 --- Comment #9 from commit-h...@freebsd.org --- A commit in branch releng/13.2 references this bug: URL: https://cgit.FreeBSD.org/src/commit/?id=a6c6edbe9d37caf1dbc81f918adf8c1f451a534e commit a6c6edbe9d37caf1dbc81f918adf8c1f451a534e Autho

[Bug 185546] freebsd-update(8) can modify sshd and lock you out of your system

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=185546 Ed Maste changed: What|Removed |Added Resolution|--- |FIXED Status|In Progress

[Bug 185546] freebsd-update(8) can modify sshd and lock you out of your system

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=185546 --- Comment #8 from commit-h...@freebsd.org --- A commit in branch stable/13 references this bug: URL: https://cgit.FreeBSD.org/src/commit/?id=c7e3703352037a5afacdc4126725f351fe7da72b commit c7e3703352037a5afacdc4126725f351fe7da72b Author:

[Bug 185546] freebsd-update(8) can modify sshd and lock you out of your system

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=185546 Ed Maste changed: What|Removed |Added Status|Open|In Progress -- You are receiving this

[Bug 185546] freebsd-update(8) can modify sshd and lock you out of your system

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=185546 --- Comment #7 from commit-h...@freebsd.org --- A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/src/commit/?id=ceb5f28ba5fcfa69de7410d2327d4a5abf2a421f commit ceb5f28ba5fcfa69de7410d2327d4a5abf2a421f Author:

[Bug 185546] freebsd-update(8) can modify sshd and lock you out of your system

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=185546 Graham Perrin changed: What|Removed |Added CC||grahamper...@freebsd.org

[Bug 185546] freebsd-update(8) can modify sshd and lock you out of your system

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=185546 --- Comment #6 from Ed Maste --- See https://reviews.freebsd.org/D37703 for a proposed change -- You are receiving this mail because: You are the assignee for the bug.

[Bug 185546] freebsd-update(8) can modify sshd and lock you out of your system

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=185546 Ed Maste changed: What|Removed |Added See Also||https://bugs.freebsd.org/bu

[Bug 185546] freebsd-update(8) can modify sshd and lock you out of your system

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=185546 --- Comment #5 from Ed Maste --- As comment #3 points out this conflict should have emitted a message and opened an editor; this may not be particularly user-friendly, and also as comment #3 suggests we ought to check for "<<<" markers

[Bug 185546] freebsd-update(8) can modify sshd and lock you out of your system

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=185546 Colin Percival changed: What|Removed |Added Assignee|cperc...@freebsd.org|b...@freebsd.org --- Comment #4 f