From owner-svn-src-head@freebsd.org Sun Nov 15 18:16:37 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E786346290C; Sun, 15 Nov 2020 18:16:37 +0000 (UTC) (envelope-from scottl@samsco.org) Received: from wout2-smtp.messagingengine.com (wout2-smtp.messagingengine.com [64.147.123.25]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4CZ0lT0KC8z3Bm1; Sun, 15 Nov 2020 18:16:35 +0000 (UTC) (envelope-from scottl@samsco.org) Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.west.internal (Postfix) with ESMTP id 2FA4AE95; Sun, 15 Nov 2020 13:16:30 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Sun, 15 Nov 2020 13:16:30 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsco.org; h= content-type:mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; s=fm1; bh=s rm+4IR36vGlhvcQu6VeicD75CHP1neNn2HFw4D9aoQ=; b=NWj8AdSHUR2ZIMNlc JU3Z1sjGO2pRbm+dSsp28k2eCYsObY/WoavbTF1+PSY2kTiarbm0hsLTsfDtqirn tD3hHLegMcDkOYHTynemGuRiU1E3dB0BlbyEuwspCnqkw73keLzelea3ZzHT3KRZ xxFsjLvnprCDAod0CcGT7wdkR8NWtN56Mv9+tsvhCVfxC22EWRhuH2tfFi2a1Bab enOYAvymVfG7H2BJtEcD7/gDQW1Tj17byf5bzOM7HVroKgC3IV4n15WcvuZHRU2J V3pOGlP614NxqR4EOD1NzRc4+uAJxN1IsfPO1CwSh77Fm1ed/IvTGOdQVgpT4e/q nQYFA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; bh=srm+4IR36vGlhvcQu6VeicD75CHP1neNn2HFw4D9a oQ=; b=iZyLz/upCi1c10XDBn1Uoj8HdZ+KuKUOZuwKEQI8Az28GjwKosQlrMX9N XSPdIxqgZ9DxbGOQEGppqYaQ4c96vCTad35JtzI0ALV6jAJJatoicsuvIIx+MauC 7YiZIR8cbt8SYT6YITffVC0kcn+zgFPy0i2sHVv7qc02+xKxtOvvNwtsjz70bA+w Mv1FRl7xonhbO81+Ig4s/TxL5NXTJlZKh3Nzn1G/VIo6qTX1lMObdTvj/mjoXR4+ qO4AmFUPhiU6B6vat9mZl2J9oGOupZA/zE6HnSB5KLpAuSaqv13Ezuv3JuIkPJ6k 2XEZ5N4x6UKgVnFtKRHqeR7vEp6Dg== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedruddvledguddugecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecuufhorhhtvgguuchrvggtihhpshculdegtddmne cujfgurheptggguffhjgffgffkfhfvofesthejmhdthhdtvdenucfhrhhomhepufgtohht thcunfhonhhguceoshgtohhtthhlsehsrghmshgtohdrohhrgheqnecuggftrfgrthhtvg hrnhepffdvhfetfeehteekgefgtdelhfefieduleelteegvdfhueehfeegudegudffheeh necukfhppeekrdegiedrkeelrddvudefnecuvehluhhsthgvrhfuihiivgeptdenucfrrg hrrghmpehmrghilhhfrhhomhepshgtohhtthhlsehsrghmshgtohdrohhrgh X-ME-Proxy: Received: from [192.168.0.114] (unknown [8.46.89.213]) by mail.messagingengine.com (Postfix) with ESMTPA id 3A6CD328005A; Sun, 15 Nov 2020 13:16:29 -0500 (EST) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 13.4 \(3608.120.23.2.4\)) Subject: Re: svn commit: r367687 - in head: sbin/nvmecontrol usr.sbin/mailwrapper usr.sbin/pkg From: Scott Long In-Reply-To: Date: Sun, 15 Nov 2020 11:16:28 -0700 Cc: Scott Long , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Transfer-Encoding: 7bit Message-Id: References: <202011141801.0AEI1FCM000287@repo.freebsd.org> To: Brandon Bergren X-Mailer: Apple Mail (2.3608.120.23.2.4) X-Rspamd-Queue-Id: 4CZ0lT0KC8z3Bm1 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Nov 2020 18:16:38 -0000 I fixed this in r367702, sorry for the breakage. Scott > On Nov 15, 2020, at 11:12 AM, Brandon Bergren wrote: > >> --- head/usr.sbin/pkg/pkg.c Sat Nov 14 17:57:50 2020 (r367686) >> +++ head/usr.sbin/pkg/pkg.c Sat Nov 14 18:01:14 2020 (r367687) >> @@ -43,6 +43,7 @@ __FBSDID("$FreeBSD$"); >> #include >> #include >> #include >> +#include >> #include >> #include >> #include >> @@ -1037,6 +1038,7 @@ main(int argc, char *argv[]) >> { >> char pkgpath[MAXPATHLEN]; >> const char *pkgarg; >> + size_t len; >> int i; >> bool bootstrap_only, force, yes; >> >> @@ -1045,8 +1047,11 @@ main(int argc, char *argv[]) >> pkgarg = NULL; >> yes = false; >> >> - snprintf(pkgpath, MAXPATHLEN, "%s/sbin/pkg", >> - getenv("LOCALBASE") ? getenv("LOCALBASE") : _PATH_LOCALBASE); >> + if ((len = getlocalbase(pkgpath, MAXPATHLEN)) != 0) { >> + fprintf(stderr, "Cannot determine local path\n"); >> + exit(EXIT_FAILURE); >> + } > > This logic is broken, it is failing on kernels that DO have user.localbase. > >> + strlcat(pkgpath, "/sbin/pkg", MAXPATHLEN - len); >> >> if (argc > 1 && strcmp(argv[1], "bootstrap") == 0) { >> bootstrap_only = true; >> > > -- > Brandon Bergren > bdragon@FreeBSD.org