From nobody Tue Nov 04 15:29:22 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 4d1C6p32yTz6GFZv; Tue, 04 Nov 2025 15:29:22 +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 4d1C6p2Jy7z3QSX; Tue, 04 Nov 2025 15:29:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762270162; 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=/vsotggKqqD1RbhdopiyHmYHPjlO7UYSw2C4vn9G30c=; b=rD1i+lh5eVwTrOZPlK/WMnNtcF1B6hWY+3IStCxcPAbtyuwmIJbAE4eiclaK6kHt1rY1JV /Xt9iX7/a+pkCLul+iTOQNjWW4mI7VByw3r20GOdfs43HvKrUyt6V5x08OxfvKXcFd1M7a PkI5XU3aa9wrd/0chGRHAJ/oe3N6yaShiz/nXQQl5YjkxRhSZUoKPhz3jr0WmmJZEWIroF UUmY9slaCN9eZ37PKG88HNg4nH1uDvrMmgYEgcMJdj7qaj4ZQ8x6xq9tnogaAex8Gg/tQg 5Pqxqe9TF6BfBqInBlyPJDSdqq6qijWB9/uRJftR+Qw0q9Z11752lCV3n6QA9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762270162; 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=/vsotggKqqD1RbhdopiyHmYHPjlO7UYSw2C4vn9G30c=; b=qY0h3Olnf0dZw1Ve5v0XME4aOKZZE6icfkE1EO4VUOHIZ2VLpQEj4roABJ1Ubq55U6rtpi NmgooPlHlggHjdzh3slqRwZlpvRWz1NI3xesV/IOt1pJdl4hlF/Ey3gAbH02bCFcm9tppk MP+pYBn53T3l/igG19BG41MJ7rXq9xf9oIpw1r+vaoCJwsdmCE8P36WGGugmu70BKRGrtk 9b0z+AXP11k0lBL0wmseFcXiZyV3lJBHfVDecrYsfpFfSKVzJ9sQUqSDfGqxIflgdqWolf rX+P5tVaKSboJly9VDfbLyKA4kbtZO1GbtEsRzSnRw43a1Puov1jywpTnImRMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762270162; a=rsa-sha256; cv=none; b=dXDNLm4TL4D/+ALBNiNQxoCbbWmW7o+CbMGJtO85hcNNkwpU8QaH37Kqpqx617RGFzQCri 0sD4Klm5QgjaKPf4+OBafbvEYoNU3uuZXc0QYr1pbPoGRutxtCClPdYE9/SkhiELHcte2a XQIm3ow+nuz1Xr016AddjdhzSt2oh5yG8QtVnA8wF5PYMtWZnUHV1ivo32lo28S8HXrDur QkWUSg+pI+TwNnDi6rqhG/rX38FC5hSOVx5QXMsWJBp8UtIiwB06SPVF4Bj6Yd6GfaOOEL wbQ06PJeRJMBdZGIXLEFQs1KjRlLJtK6XmsOpoVZNV0hV30ZD7L/QLVzFoaEnw== 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 4d1C6p1mfGz12nL; Tue, 04 Nov 2025 15:29:22 +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 5A4FTMLc099611; Tue, 4 Nov 2025 15:29:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A4FTMfc099608; Tue, 4 Nov 2025 15:29:22 GMT (envelope-from git) Date: Tue, 4 Nov 2025 15:29:22 GMT Message-Id: <202511041529.5A4FTMfc099608@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: 05a3f80efe91 - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: 05a3f80efe91b2cb9856ffd6c4a68d06117da824 Auto-Submitted: auto-generated The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=05a3f80efe91b2cb9856ffd6c4a68d06117da824 commit 05a3f80efe91b2cb9856ffd6c4a68d06117da824 Author: Dag-Erling Smørgrav AuthorDate: 2025-11-02 13:45:12 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-11-04 15:29:19 +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 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();