From nobody Fri Feb 25 16:16:53 2022 X-Original-To: dev-commits-src-main@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 427D619D529D; Fri, 25 Feb 2022 16:16:54 +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 4K4vzp1MR2z4cx6; Fri, 25 Feb 2022 16:16:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645805814; 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=fGhuKjXbxNBlfAJc46+TJNCKi0Pf0PVxc+/4FFkbTC0=; b=Z8azABDnaJo0NcA5apiPDjVDo737udx6Wdu+bqVAvFCMMEk1sNZTBFFvVMdASET0VmzVkv VkSUEmrESGuJ9FBt4rFuxREcH+DlDAjzZoesIVpEhn+SvGxw7loNXIRjDYTypbZ4WH+EMR Cm5z6MSyiosDVPO5FMLeVSo2LiIqHWChmpo1OQF1T432LRtQsoktVkVqTpv+7udn1mVYTQ SBvJjakkG+2c42X+E1oTiz1rkKEbaT7jeXO2JbKPWTuDl8OOdwxBxAitqFkNZDvN77imZR 8si3jkZfeSfapC7Enaf+Rz5jWl++2OSNoJ06iiq0VmMSHHMczYmLboOS2LZ0LQ== 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 0F20322E01; Fri, 25 Feb 2022 16:16:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21PGGrnx031058; Fri, 25 Feb 2022 16:16:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21PGGr47031057; Fri, 25 Feb 2022 16:16:53 GMT (envelope-from git) Date: Fri, 25 Feb 2022 16:16:53 GMT Message-Id: <202202251616.21PGGr47031057@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 6c799530d8dc - main - rtld.1: Fix misplaced text List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6c799530d8dc91d4e5c390274b8a27231f369a56 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645805814; 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=fGhuKjXbxNBlfAJc46+TJNCKi0Pf0PVxc+/4FFkbTC0=; b=yoLeQnrbgrntn6F36hF+tzjq7uEeoBUZe/oT+jsWueyXys3BDk+1sLyCU3/Vdl/K7Gq0ru NsArbzSQ/AJk6Kg9pP/4XQmVzpAuZVAEBwqtkF7+/6/1cKbeBwz69BdG7ew2GBc2sfvz6a JGWIhpf4bRARIw+2933M/fT8gobNaPA7K4fR6bCiThg10/ifS5fAQ4/ynqoxGAE+g3/h5N ux7+fCbR6RYR1aI2mIp/XI0cK8xOdU0HJxs+NqBxzgWk9ZKL7d/7SZ2TP7a2ivcLR3SxyQ gm1OwCIhj0k+IlWxdpHCIuFZS+nMpX24AsB6OyLxLcAnRmAg01NVOYAshtGfEA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645805814; a=rsa-sha256; cv=none; b=nZskdDhM/BeAnVpFMN4Y+UN22yxuKj94zOjEqqD2FVMKQaEDrdMerzPjdboH90G7bQF6J6 yVwlSmZFyHsNs2NayCKB/BsKeg7GJGj6Ds8aUzqP4Rq8HMyv59pVc03xnhLzsVHKrFI75A D6IuZRb5KZcGRnHVc9/xAC6IWKR/7LhFVWp6P+6lST5SWCEiNljykjfq2H4aNPTLS88Va3 Gklv0oFEyMWbJI41LDB0F9y9ipsi/DrmQO2Jiddiv9LkK1D5BvIl6HqoNLx2VTR7Nrzswl /LnUmbbpv3/9S34hUou0zFCnfbdToKMfdDlFuPfJbzWBCJq4P2YWoZByC+C/0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=6c799530d8dc91d4e5c390274b8a27231f369a56 commit 6c799530d8dc91d4e5c390274b8a27231f369a56 Author: John F. Carr AuthorDate: 2022-02-25 16:09:03 +0000 Commit: Mark Johnston CommitDate: 2022-02-25 16:16:35 +0000 rtld.1: Fix misplaced text PR: 262194 Fixes: f90218886fc8 ("rtld: introduce PRELOAD_FDS") MFC after: 3 days --- libexec/rtld-elf/rtld.1 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libexec/rtld-elf/rtld.1 b/libexec/rtld-elf/rtld.1 index 66aa2bdabd17..c29d1fb1f90c 100644 --- a/libexec/rtld-elf/rtld.1 +++ b/libexec/rtld-elf/rtld.1 @@ -208,6 +208,10 @@ to be linked in before any other shared libraries. If the directory is not specified then the directories specified by +.Ev LD_LIBRARY_PATH +will be searched first +followed by the set of built-in standard directories. +This variable is unset for set-user-ID and set-group-ID programs. .It Ev LD_PRELOAD_FDS A colon separated list of file descriptor numbers for libraries. This is intended for preloading libraries in which we already have a file @@ -216,10 +220,6 @@ This may optimize the process of loading libraries because we do not have to look for them in directories. It may also be useful in a capability base system where we do not have access to global namespaces such as the filesystem. -.Ev LD_LIBRARY_PATH -will be searched first -followed by the set of built-in standard directories. -This variable is unset for set-user-ID and set-group-ID programs. .It Ev LD_LIBRARY_PATH_FDS A colon separated list of file descriptor numbers for library directories. This is intended for use within