From nobody Tue May 07 08:59:33 2024 X-Original-To: dev-commits-src-all@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 4VYXK15WLsz5KPHY; Tue, 07 May 2024 08:59:33 +0000 (UTC) (envelope-from git@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 4VYXK13MS2z4Zkt; Tue, 7 May 2024 08:59:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715072373; 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; bh=tPGE/B+UrBB2dRENwZtmE/QtSCinsmljeQTAT0MCIWQ=; b=h4Dv74qqUdxtdMdAQ1/aV7ZQBWS6gr2qLCA6lAx9isATNT3T0/gL9ImRYmpAnrw2gErb0p Df2iiKbNTaxFAb0+TVcekb7ub+wDdGDp48SKn4qGusBh9FlA7m3y6bnZw9XLedN3AXjWNM dhX0JdTNZ+npyKg2NeHI9YsUBx3ENO9ABRDLH9waW4AEYUgsP8/fZvK71i9eUOXRR5JfRM vkW4klHRYqC93i+B4DTREsgAMaYGsEBcKXIRo4iMPrd6B62wwzOo4XbCOG1ZvR7si3c5XV zZlEJODJzLhyDFY+K/ZzaF1rvBlHvXuhYK5qzwRVeu3+1SqXUo3/YRUkNS1MZg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715072373; a=rsa-sha256; cv=none; b=JVJVJ+znoRW7SaBUXpVcP6cH6cEa1htgueWGv5dc8W7ZP1K5B//vrE9m2ifkhJ77FkGisn Tt43qeBGuEj/Q69TwEwPosQiIupM+qWnL7EGokuvqqN0HRgSbpIpVhN6Xdf4NEtztwpzWJ rxxt0p/8U6F+o7xTUwztDrCdYpStwUh4vuV7WF2rsOBocyaw47Sp1bQRT4LduiPINWKy3g 385OvGS4JfsmGrX1PsmsKODIbhVv1s7ZCpTCVgKJB5nxkK9JPosI9JOsu0QqnCkMruu2YJ osrK+dsg/o8H+mEugYgInNQ3mP732CKnvvUu0xKGTsUFdXEJoy9rWiZwNdQDDQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715072373; 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; bh=tPGE/B+UrBB2dRENwZtmE/QtSCinsmljeQTAT0MCIWQ=; b=HkbRONXSByzc5lf9LuCKbnCnzwnGTnoaCKIYOHP4LRZbguerWlQq4sPSgV2NCQ1nmnRoeS nZ54vMUpL+xIRf7HrNInnYlrbafPmmX/87W7nD/6Tjgw8nRQ/FrB0r3iQZWy/DwYGbOYIr 1Xj3fvLH1FWMRsZwpQ/V1Vhe1SJqLhcOWPthVBcS6U4AFgFxW0A/8F36R9IDqAWy6/R5up 8tjljEfDPCuU1uw8FegvH+a1PHIupzhrwjgfxP2YI528/xqYQmevStvgT4yZoZTG4ESC02 YQB6NXd1iRHmMJnH0jnok1wxmombk74HomFLLpJvWk0cj4p5IXgw2jgZa36VIQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 4VYXK12zVpzbTJ; Tue, 7 May 2024 08:59:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4478xXZ0021556; Tue, 7 May 2024 08:59:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4478xXS3021553; Tue, 7 May 2024 08:59:33 GMT (envelope-from git) Date: Tue, 7 May 2024 08:59:33 GMT Message-Id: <202405070859.4478xXS3021553@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: e45b440633f9 - stable/13 - rtld direct exec: make -u behavior match the description List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e45b440633f9878baf019d3ef557bd2be103c3f9 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e45b440633f9878baf019d3ef557bd2be103c3f9 commit e45b440633f9878baf019d3ef557bd2be103c3f9 Author: Konstantin Belousov AuthorDate: 2024-04-28 20:57:54 +0000 Commit: Konstantin Belousov CommitDate: 2024-05-07 08:59:07 +0000 rtld direct exec: make -u behavior match the description (cherry picked from commit ef2694f368cee5957ee44b0298da88ff8360d561) --- libexec/rtld-elf/rtld.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 071a7cf8dde8..7110ba6c4c1a 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -6233,7 +6233,10 @@ parse_args(char* argv[], int argc, bool *use_pathp, int *fdp, } else if (opt == 'p') { *use_pathp = true; } else if (opt == 'u') { - trust = false; + u_int ll; + + for (ll = 0; ll < nitems(ld_env_vars); ll++) + ld_env_vars[ll].val = NULL; } else if (opt == 'v') { machine[0] = '\0'; mib[0] = CTL_HW;