From: Lucas Gabriel Vuotto <lucas@sexy.is>
Subject: Re: rc: Use the correct path to sshd-auth's relink kit
To: Josiah Frentsos <jfrent@tilde.team>
Cc: tech@openbsd.org
Date: Tue, 22 Oct 2024 11:12:36 +0000

This is correct. I'd prefer the following patch, to avoid this from
happening again in the future.

OK?


diff /usr/src
commit - c9003b50c37ae389c00c2c679ef66128e37bec89
path + /usr/src
blob - 5ded55cbdd9661c696aeebe455a4235ee93f1e58
file + etc/rc
--- etc/rc
+++ etc/rc
@@ -208,6 +208,7 @@ reorder_libs() {
 	done
 
 	for _liba in $_relink/usr/libexec/ld.so.a $_libas; do
+		[[ -f "$_liba" ]] &&
 		_tmpdir=$(mktemp -dq $_relink/_rebuild.XXXXXXXXXXXX) &&
 		(
 		set -o errexit
@@ -242,7 +243,8 @@ reorder_libs() {
 	done
 
 	for _bin in $_relink/usr/sbin/sshd $_relink/usr/libexec/sshd-session \
-	    $_relink/usr/bin/sshd-auth $_relink/usr/bin/ssh-agent ; do
+	    $_relink/usr/libexec/sshd-auth $_relink/usr/bin/ssh-agent ; do
+		[[ -d "$_bin" ]] &&
 		_tmpdir=$(mktemp -dq $_relink/_rebuild.XXXXXXXXXXXX) &&
 		(
 		set -o errexit