From nobody Sun Nov 02 13:49:17 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 4czx0F4m0Jz6FmxL; Sun, 02 Nov 2025 13:49:17 +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 4czx0F3ygnz3lSx; Sun, 02 Nov 2025 13:49:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762091357; 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=zPE1nMiZlHIets+dXiyxRswkP9GzKkcVGOWUh1IACgI=; b=Y//y55ygQV3aBSr7mpDms3UFzNG2upsqyDnsEoETBvLb30n91SjbVH93BQXAU4K8Y7p9zC nDhWKsidv1600NKMviKPWXGhloK0Av4HmSNVmPBoe0gg2MLO+aiVIrBxzuBP6/Bnnuf4f7 Fp9KUOJVrf87PDxQpWlzIFko+bmG54+ka0K/zHc3f8Qx3bFg3HtrKvB6/BQCslKGO5yU6Q aBCkzHoPyA86PhkIlUyKQ5l0w45RN1C9D1RT0usf3Q0C8g5FUh5O9qcB00HGkMWrkDYeNb 5VhRhsD6DOY/vbd7Rg30ol9JbIMcxcBWGdVaSBhZIz1e/jh3NMuovknFKdsDbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762091357; 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=zPE1nMiZlHIets+dXiyxRswkP9GzKkcVGOWUh1IACgI=; b=SiGFADcahMyTkxGfTBT10AwE9WZvxsJlfjXJh8DndjzO9phj/uVhrC9uOgOgdhjaQmMljp urLDGDbmZy3E+ucU2ErHbI42NGGrhHzNxii6cb9UcP0YSNvzbr/AA8fbDqC3SkJPh7hOrr KeEd1dBPTgj+rcrFOKd2411byC1jYZFjwNOT5UhZ57O8yDeYkqm5pxQ0e+Z4Sju4870nIU 9/UmBsYeO1N9SgLfqJpXROlsiKJWxtUr1iGpR03IzxVPiAMOQ5rbuErP8tu+Z+KlrSoMPt /Z/zvU3xuipKHo3I5mfY5xD3VahrlwZ7lnaWMqoMeEziT4TLej+qMcAEgqaCUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762091357; a=rsa-sha256; cv=none; b=EQ4v13eg5tnzBjtZP57AUdmQ553fnCbEQKo312yEHyI1fZvM/4JWJjrulMaTj0g82/wT8W 5Qk/kyNQ5KjqnzBktJNlUcPBuvwJsxJyYE63KywELFrOXQoofCHHJBERN/oEC8fC+FLGeA GQFpNpC0tY9SuaZa5p4QeQPmCWb/cys8axRYuX+StKCIbvoEFTcYT0tbW10EP9yTsvfJv3 XrQdioPt4kx3M8CTF9f6XgVKqudtvqUrehrO4/6zdj3fLL5EC5J9XZBP+xgdoQQGVUU/hb oGMS6A62O9hDWue78LSPucJr1mXzpDV1OCl2tPfKEjdNYmxGU1a9eCMVq2doTw== 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 4czx0F3XL1zCLg; Sun, 02 Nov 2025 13:49:17 +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 5A2DnH25085802; Sun, 2 Nov 2025 13:49:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A2DnHYo085799; Sun, 2 Nov 2025 13:49:17 GMT (envelope-from git) Date: Sun, 2 Nov 2025 13:49:17 GMT Message-Id: <202511021349.5A2DnHYo085799@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 92a533ed1d3c - main - 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: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 92a533ed1d3c81a772815f90cc9aff9237a4429c Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=92a533ed1d3c81a772815f90cc9aff9237a4429c commit 92a533ed1d3c81a772815f90cc9aff9237a4429c Author: Dag-Erling Smørgrav AuthorDate: 2025-11-02 13:45:12 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-11-02 13:48:12 +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 --- 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();