From nobody Tue Nov 04 15:29:41 2025 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 4d1C795cHXz6GFmJ; Tue, 04 Nov 2025 15:29:41 +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 4d1C794DZXz3Qnb; Tue, 04 Nov 2025 15:29:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762270181; 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=e+69fKPTWdrDuq3ocsl/j7B6IutMGDoJe19pmoAjYoU=; b=atN+lszxbOJmTXBIjQIzy+bwv19203uqph+Zhs/AcUyaqCj2Ten2rm8Ezo/a1tuGebst5b HEN1AZu75plWHZ2sXwRlKF7geGKqmaurU9EgoEkXGKU3IHCTKsASsWZa2KsTv8MzmrDhJo fKNEB7hq4vXUZT2NlOVN/ESIrxBVheWzgF0ToSEuunZ4xb43h1mzGBSNW70eBP9/O2CbPn bRyxpbxRsQNP8aPG36PGoVOcEHK3iFfE1EFZHeg3ZAeOXzGbw27Ml9NpCfXqOdMBcr3ATl m+ZWq3S/ekerVUq9DmdCdey6GjaQTJqiKIuZ8qpD2Jx9/N6JVwQKXxY154gboA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762270181; 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=e+69fKPTWdrDuq3ocsl/j7B6IutMGDoJe19pmoAjYoU=; b=AApQxhTelCe6t/RE22O9foPLDaHBE+3Se76y0B2Yof4lt96ZKKCsMTIkayzCWhxW7t1zgQ fGBG/OMTSYHSLJzOvX8tZBOqUs37oHNj148q2j3wB9fW0KPDoz18u/x3AWucx/HMVeTsPM MeptKewZnJ6LXlu1tDQMNH8Rt3NKfyJHtnRVAbyoaVQQS/p/xP24VQDkdaurYn8vyServI pPKJKeF8tAjbCfqvVhQ+JsFhJBxNZC7Z8xB4goDZ2JHyYpr2NKXJ2inepA1optu7I7WfWk qHq8hHeJ+50Cul/fleM8R0ZHZ2pk0NEI91+NIyBFmDoHexgfpwRcErASSqx3mQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762270181; a=rsa-sha256; cv=none; b=Z+yzpZAsnya1vyDEtpCPNv3i9m8NzC8LUvf40ekZAQPv486u+BmHTsJDAq3Qyzlybl/HT7 zN9zOerA/6aJkK1lZcvggpHx3+oL6Y76eeg9vpItiAzbW9KhreKYPnx2JrX/IDPj/i4sMJ +epeWAJJ6+B7UvkkgdWb4fYnnnO4v3viyT8CaYcAa/zPvABQgK2rnpIXx6p5iybxNUxcSq R5GhAT6HCItpXmow9Aaga7IcFsXpvqYsgYd2QEaDEKVrJjTb6Kf+/vYrUdaM/8a4rTbVQn Lsp+zkRZp+xNDoabEO/eA4geoErcvvLpzklIzjJhXIQdr/6fPll9ycQ7SVeijw== 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 4d1C793rC4z136n; Tue, 04 Nov 2025 15:29:41 +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 5A4FTfpf099844; Tue, 4 Nov 2025 15:29:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A4FTfVv099841; Tue, 4 Nov 2025 15:29:41 GMT (envelope-from git) Date: Tue, 4 Nov 2025 15:29:41 GMT Message-Id: <202511041529.5A4FTfVv099841@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: c64b594a3064 - stable/14 - id: Fix WITHOUT_AUDIT build 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c64b594a306480b567ed7132947459af9cc6aec5 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=c64b594a306480b567ed7132947459af9cc6aec5 commit c64b594a306480b567ed7132947459af9cc6aec5 Author: Dag-Erling Smørgrav AuthorDate: 2025-11-02 13:45:12 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-11-04 15:29:38 +0000 id: Fix WITHOUT_AUDIT build Rather than add more ifdefs, trust the compiler to optimize Aflag away. Fixes: 70b72ede982f ("id: Clean up") PR: 290740 MFC after: 3 days (cherry picked from commit 92a533ed1d3c81a772815f90cc9aff9237a4429c) --- 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 238c6f2bf709..342a891e4165 100644 --- a/usr.bin/id/id.c +++ b/usr.bin/id/id.c @@ -79,19 +79,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();