From nobody Wed Nov 05 19:37:32 2025 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 4d1wZj1KGfz651v6; Wed, 05 Nov 2025 19:37: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d1wZh6c4fz3sWt; Wed, 05 Nov 2025 19:37:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762371452; 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=5kBC9Tzd6Q4U4d6F7bot7pS96N/hJDPBfKlCzpqveyE=; b=GjOpgDMII+n3vqnL8KGaUH9/w/NSBzj13nU2Inw0MeDot8Lx3Z0lyC/3O4TT0TRIbgX7dZ E/go8PJ7ABUZx+Pc9AoDFlfhNEhFAYCETR30aoiJMKdiLnPOCdoKpLFgCRa6glhgCw/ztj 7GT8SzuAsxDl3K+64GFVFva46ckHIzACeirI3R0DqWgj89uoTmz3xBUMx4I4HRZbbKfXEG CZdSw0rSCQHGJvUqAKmbTa0fmXvQM6cGI2Y/Kw8zx+abKZRDuBB69H3QeqHnuSuPPetlnJ xz477IdbnPKD15p0j1TJzPObtIUxsRa96z/BOWI9jqbQyuomUl7YjNzpKn0Q4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762371453; 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=5kBC9Tzd6Q4U4d6F7bot7pS96N/hJDPBfKlCzpqveyE=; b=jKuE4benc255hdNATij7HJctgIXHdJCZhwb82F3oyJkSOs6+OYGiF4Mg6ND+x4BoeQj0s/ UDnU43etxCFcg9eHQZ6Ys9gDJG7zbN5lMWFe4Px2VbLa8I2rsS+QCuoEegCUN6heqFRLza ckzR2RNDV3nOy5ZL+vjRQbsA4NZ/v5CGmY7/o9YLWbf6oz4BaUfZQQgaw/+FT+sOXFbmmc TumuI/GwBmRRbn82resrvqgpr/9KJR2g9l9kKoLMLq9KmVvyvMYEjSOw+34vyZN3w58YZc 3ZOuP44T8zYtQ4n9soK2Y+JvchHVVZvatsPgeNZXpNLndbZAcTA2+QqG2PifAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762371453; a=rsa-sha256; cv=none; b=psSQf200BvAZKVOtsTjpwvdHeODATHWr8Z3nXFmv3WiMhjep7QcXFeGjtHVNILXxq6hTmn xPHZh+4crjTtc8U5F+Cxkpk8Eq7l9YZhZ7lwKiRMIC0MM1pMhfdJehde4af4Ue/+lj4sk8 Oim5mSSayVl2QLi7LYUufOiv6pFmXqVCicRDqKzfZQRej5sR/7PmFeEznDE1xxzqn+gp23 hQIcpp00vtpVN6F2NHAIXBazQLdWHldRaBdfl33csa6BXIjiMnhX5mst3GH/JVv3bip9rb i5hqvGY5f9RYURGeYmwLRJHhvt900wWUN3d7DTrp3leGfll1kBSdwAySt+t5tQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4d1wZh6BzszwwK; Wed, 05 Nov 2025 19:37:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A5JbWZt086352; Wed, 5 Nov 2025 19:37:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A5JbWqQ086349; Wed, 5 Nov 2025 19:37:32 GMT (envelope-from git) Date: Wed, 5 Nov 2025 19:37:32 GMT Message-Id: <202511051937.5A5JbWqQ086349@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 290b9b6b262b - releng/15.0 - id: Fix WITHOUT_AUDIT build 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 290b9b6b262bfbc5559d638ef88b83fd27ebd385 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=290b9b6b262bfbc5559d638ef88b83fd27ebd385 commit 290b9b6b262bfbc5559d638ef88b83fd27ebd385 Author: Dag-Erling Smørgrav AuthorDate: 2025-11-02 13:45:12 +0000 Commit: Colin Percival CommitDate: 2025-11-05 19:36:35 +0000 id: Fix WITHOUT_AUDIT build Rather than add more ifdefs, trust the compiler to optimize Aflag away. Approved by: re (cperciva) Fixes: 70b72ede982f ("id: Clean up") PR: 290740 MFC after: 3 days (cherry picked from commit 92a533ed1d3c81a772815f90cc9aff9237a4429c) (cherry picked from commit 05a3f80efe91b2cb9856ffd6c4a68d06117da824) --- usr.bin/id/id.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/usr.bin/id/id.c b/usr.bin/id/id.c index 5f9d2670caa3..7ba07daad11e 100644 --- a/usr.bin/id/id.c +++ b/usr.bin/id/id.c @@ -67,19 +67,13 @@ main(int argc, char *argv[]) { struct group *gr; struct passwd *pw; -#ifdef USE_BSM_AUDIT - bool Aflag; -#endif - bool Gflag, Mflag, Pflag; + bool Aflag, Gflag, Mflag, Pflag; bool cflag, dflag, gflag, nflag, pflag, rflag, sflag, uflag; int ch, combo, error, id; const char *myname, *optstr; char loginclass[MAXLOGNAME]; -#ifdef USE_BSM_AUDIT - Aflag = false; -#endif - Gflag = Mflag = Pflag = false; + Aflag = Gflag = Mflag = Pflag = false; cflag = dflag = gflag = nflag = pflag = rflag = sflag = uflag = false; myname = getprogname();