From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: passt.top; dmarc=none (p=none dis=none) header.from=gibson.dropbear.id.au Authentication-Results: passt.top; dkim=pass (2048-bit key; secure) header.d=gibson.dropbear.id.au header.i=@gibson.dropbear.id.au header.a=rsa-sha256 header.s=202408 header.b=rnU/U0V4; dkim-atps=neutral Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by passt.top (Postfix) with ESMTPS id C8C715A004C for ; Tue, 27 Aug 2024 02:56:07 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=202408; t=1724720163; bh=D3pzyKDSUPLDl/NB1X/COEf52thYW1SKllzU3bZALic=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=rnU/U0V4EsGDmt29MYC1mEoMaX3+0RKYZUmkUxaeGPFX42gDmaKNPJRnBZAJf3rpr 5X3Fo6+IMmaxgQXAagzSea3qO8YCCmihCR8r8ZoCKjiQDZVVrIHsoC0c+kYImH4Z1A adN0ENzumtae1fCKnDDbF731hyoyghvaOOzQ0u8scp2iPD5NxV6WjryxS76LdS6O2A f5IkauGhBX3ze5X2At77Q9542CQqNh4IKtJV45QT1IgsnPLkg7/0tv0chyBon9buDQ sBG32BsWKQi/xX9xua09Xl9Jt2uSWVAVMlPooc33Z6YdoBaHB5AKF5D7biJjL1VACn +UWXgJyFc5cfQ== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4Wt8HR4zNbz4x3J; Tue, 27 Aug 2024 10:56:03 +1000 (AEST) Date: Tue, 27 Aug 2024 10:55:57 +1000 From: David Gibson To: Stefano Brivio Subject: Re: [PATCH] test: Look for possible sshd-session paths (if it's there at all) in mbuto's profile Message-ID: References: <20240826184131.1811095-1-sbrivio@redhat.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="eVXW2adjeCQ5dqd9" Content-Disposition: inline In-Reply-To: <20240826184131.1811095-1-sbrivio@redhat.com> Message-ID-Hash: X7MTRXN54CV3T7HDI4CIPGKP7I2YNMGW X-Message-ID-Hash: X7MTRXN54CV3T7HDI4CIPGKP7I2YNMGW X-MailFrom: dgibson@gandalf.ozlabs.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: passt-dev@passt.top X-Mailman-Version: 3.3.8 Precedence: list List-Id: Development discussion and patches for passt Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: --eVXW2adjeCQ5dqd9 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Aug 26, 2024 at 08:41:31PM +0200, Stefano Brivio wrote: > Some distributions already have OpenSSH 9.8, which introduces split > sshd/sshd-session binaries, and there we need to copy the binary from > the host, which can be /usr/libexec/openssh/sshd-session (Fedora > Rawhide), /usr/lib/ssh/sshd-session (Arch Linux), > /usr/lib/openssh/sshd-session (Debian), and possibly other paths. >=20 > Add at least those three, and, if we don't find sshd-session, assume > we don't need it: it could very well be an older version of OpenSSH, > as reported by David for Fedora 40, or perhaps another daemon (would > Dropbear even work? I'm not sure). >=20 > Reported-by: David Gibson > Fixes: d6817b3930be ("test/passt.mbuto: Install sshd-session OpenSSH's sp= lit process") > Signed-off-by: Stefano Brivio Reviewed-by: David Gibson Tested-by: David Gibson > --- > test/passt.mbuto | 11 +++++++++-- > 1 file changed, 9 insertions(+), 2 deletions(-) >=20 > diff --git a/test/passt.mbuto b/test/passt.mbuto > index 61865e8..138d365 100755 > --- a/test/passt.mbuto > +++ b/test/passt.mbuto > @@ -13,8 +13,15 @@ > PROGS=3D"${PROGS:-ash,dash,bash ip mount ls insmod mkdir ln cat chmod ls= mod > modprobe find grep mknod mv rm umount jq iperf3 dhclient hostname > sed tr chown sipcalc cut socat dd strace ping tail killall sleep = sysctl > - nproc tcp_rr tcp_crr udp_rr which tee seq bc sshd ssh-keygen cmp > - /usr/lib/openssh/sshd-session}" > + nproc tcp_rr tcp_crr udp_rr which tee seq bc sshd ssh-keygen cmp}" > + > +# OpenSSH 9.8 introduced split binaries, with sshd being the daemon, and > +# sshd-session the per-session program. We need the latter as well, and = the path > +# depends on the distribution. It doesn't exist on older versions. > +for bin in /usr/lib/openssh/sshd-session /usr/lib/ssh/sshd-session \ > + /usr/libexec/openssh/sshd-session; do > + command -v "${bin}" >/dev/null && PROGS=3D"${PROGS} ${bin}" > +done > =20 > KMODS=3D"${KMODS:- virtio_net virtio_pci vmw_vsock_virtio_transport}" > =20 --=20 David Gibson (he or they) | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you, not the other way | around. http://www.ozlabs.org/~dgibson --eVXW2adjeCQ5dqd9 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEO+dNsU4E3yXUXRK2zQJF27ox2GcFAmbNJBgACgkQzQJF27ox 2GefxQ/+MwMgsOM3FGZmAls8g3/L6Bich4OpgMTxhqAuDX9AQxIpdukapTFWL3u6 o+wSsAjtAFCO7VwqCczAkJAoAP4WE4I72lFTI/yDrPDV5qvzyuJweUPah6PgCJTo oSKsJDGjqA7GUS8NK5Kl1IB5TdMwbKk6ZajW5RRD8tTpQSYyG7IM277hyftVos0L YM8Ov/3GjRc/MlkLn1bI5ESIx/6cqP1wd6tL/d4DKQIk+d6rtXdwjEHPuhiHrNOe eX/LIBCURvLmKy2Ay1pAP98Deyp26TYrnjE7WVbEqcY4CxJZysNm2uNwXwQpnVgA gf5lqtk5Q44WIiGa24F4ewrHCk5bcTlLiPmv+XYsXNuoP1jakD5ycS3piNL4PVio gEjJf2qBwZ4Z5NM2VAYOUuK2Z6ntRds0fY6ftt1AsGJCl6+edCCusjWHdL81AtFA J62rbH2SuoUITwE9tfnDr4tEkKBnUZgovcmCs5bq1wU79SKyzffNR5Vv1a1rZ1MH DRvbDpWCHTG30jISF946bT4Bg94hqbpaW8oMm0oRVk35o0mDlhU5Y4f5MCaWa7NR DQm3g2pCPuQLb21ooqUg2rSSy+T3BMKD4/EZYQEHNjMfo4cqKfRLwJSPZvAn0q92 VX0so+PEtvprK0IxkTJxunri2LbDt9ZAurv5ntkXc71trnaFB6U= =OCFE -----END PGP SIGNATURE----- --eVXW2adjeCQ5dqd9--