From nobody Tue Jan 24 22:10:02 2023 X-Original-To: dev-commits-src-branches@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 4P1h3b2qHRz3bdXn; Tue, 24 Jan 2023 22:10:03 +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 4P1h3b0sLkz4Hhb; Tue, 24 Jan 2023 22:10:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598203; 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=xKCmirLuzfqym9npMMiTk0jMmvNz7dznsNi6t9LfsaY=; b=RbcT1rhvl37xBUI2aUXFZfB3lzXU5zxH1IztCVUzxBNfDVhbUhMZK7d4vClPck4TpHbYg6 pqJz18D752LJnjukdOtwgXwb+ooEr0TrMMqEl/tBTqh/759H1laI/Ps25TvLg6GUURh1sB KNJ4rlkd28Gd9BBkzhGfp9uDsyW0qWDrlTsr9f40nXOoBnfGO3SNoY13NK1GcC4jjFwAH1 CWksR/eKGCDxZjKF52WW6RirECG0fOkitcfhTjhXpyH2gy/LInF66mInR6oieNJa0hdlNU Cgpj5+nEpqfmWNWPhmc3GMpOBPg6Ls64uMd5vrVYZB1Fv2P+Uc27hXx62MUsjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598203; 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=xKCmirLuzfqym9npMMiTk0jMmvNz7dznsNi6t9LfsaY=; b=fxzt/byl4aAPx/1vbAfJ972xB2CZLe1KPrh3vObr9UbLyePl82BWlYi3uH5vh3MR6sYBTw jIjS/E6Om14Cp/KxC22THyKT9IuKygpFou6zTjUoGZs28C8l7HRYSXZETqeZcCokt29vnO +h9pjCdnz6YcKvCo7JHy5IR2qRSeRoqHa2eSgJOTkTFXd9u5/EemRQNIV6Ri4bsKY/kHYP UewI5tBH2NM4pBR4S4uNfOIiBJl4FDg1DCGO53V1MtEi6VLtVy92zWyWzCbXSARvsQxhhk ORZmP3LPaVUWxLYJtmK3SnE3YE9/HXuPozJMCjoGr5UWrGvENOYnfRgz0esBaA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674598203; a=rsa-sha256; cv=none; b=vpkVBEtUsDxBEvrT9NXLFWWDzK/ezX+d7xruUCCdgDxkFOpb5ioQxd3HZg8K7e4Zg8qb64 fR2WugfrWUYd931FqhPEw0Gu0ejOaavrr+1VlqO+9Rg3SFRp2jsFzbnAb5kPKz/VhxehSW tfZpcjl6jvma6fSq/80HgHSwfnfWMhDoA30w5EF89jV9LHzIgfHSUa9a0e8aJVY5eIQ1OW nWTJ5j75mb57k1VgiQ2lTj1QJyK7rxru1SQD2LnVYFvJsDhUhmM0GiCVxD5O0bBVGI9zKx WBuuclrzgOODef2q4PXX2GRaNYZD5h4m+3x5TSoY87pK7sQZybDEd9iIX2S8mQ== 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 4P1h3Z738XzQQn; Tue, 24 Jan 2023 22:10:02 +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 30OMA2ef073286; Tue, 24 Jan 2023 22:10:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30OMA2Pu073283; Tue, 24 Jan 2023 22:10:02 GMT (envelope-from git) Date: Tue, 24 Jan 2023 22:10:02 GMT Message-Id: <202301242210.30OMA2Pu073283@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 26d6cf83968c - stable/13 - loader:prefix is only used for LOADER_VERIEXEC List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 26d6cf83968c388a80fb0fe1f06edfddf36177bd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=26d6cf83968c388a80fb0fe1f06edfddf36177bd commit 26d6cf83968c388a80fb0fe1f06edfddf36177bd Author: Warner Losh AuthorDate: 2021-12-13 19:02:16 +0000 Commit: Warner Losh CommitDate: 2023-01-24 21:49:18 +0000 loader:prefix is only used for LOADER_VERIEXEC Only define and set prefix when LOADER_VERIEXEC is defined. It's only used by the LOADER_VERIEXEC code. Sponsored by: Netflix (cherry picked from commit 5c68a21697027311892481d6d615a5d6e5b47433) --- stand/common/module.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/stand/common/module.c b/stand/common/module.c index fdc65541b1a5..8e9e72c8a004 100644 --- a/stand/common/module.c +++ b/stand/common/module.c @@ -112,7 +112,9 @@ command_load(int argc, char *argv[]) { struct preloaded_file *fp; char *typestr; +#ifdef LOADER_VERIEXEC char *prefix; +#endif char *skip; int dflag, dofile, dokld, ch, error; @@ -124,7 +126,10 @@ command_load(int argc, char *argv[]) command_errmsg = "no filename specified"; return (CMD_CRIT); } - prefix = skip = NULL; +#ifdef LOADER_VERIEXEC + prefix = NULL; +#endif + skip = NULL; while ((ch = getopt(argc, argv, "dkp:s:t:")) != -1) { switch(ch) { case 'd': @@ -133,9 +138,11 @@ command_load(int argc, char *argv[]) case 'k': dokld = 1; break; +#ifdef LOADER_VERIEXEC case 'p': prefix = optarg; break; +#endif case 's': skip = optarg; break;