From nobody Mon Dec 8 14:17:43 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 4dQ3wR2RDCz6Js3D for ; Mon, 08 Dec 2025 14:17:43 +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 4dQ3wR1QCwz3q9K for ; Mon, 08 Dec 2025 14:17:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765203463; 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=hQ0klcVz9G0HCNNUrcJnuAzul/1iNFp5myaysoce7kM=; b=I4ryljmyAsCsG+co9NLYc9ApEBxfupZirhpDax/ZuvatibOWQ6RjzPrXpRPGMtkbO6jqe9 5elKR+P1v3QoA+/fo9r78dl9a6X+KVQypTNEoPZEBVzzmzQw5ahMs+0UOEgMH85301EKT6 BLQUCJJrB/o+CiAXZkCk2N8Y84cIFLr0kU9ID7+Ndv+EicLWQt8u4GsTBenxIhfET2Ap5G KwzxSScfpT2ZNnNPXWdEqqJJla6JB0KN9oCIlaxTOLOpK546r5ZFK4OjP33zWD/meZeTn5 2LjWbOoN6N8cEez2WnyydjLAh8hVa9EsoKgSl3ZxWbixDb6CrBD/4OLSx6EtVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765203463; 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=hQ0klcVz9G0HCNNUrcJnuAzul/1iNFp5myaysoce7kM=; b=bhiroY7k+BMeSHukZAoHQc2PVCcCr1Fgl90r9zEhV4k/fttk3ksUedcSjZvrAAa5/8xBPA beXzMhY2ymp7O6hP/m9KAt9b4x62Ec/rmN/kRmTSS3eATBPJlPcVBHXCf3E8icOzuPoQ1W bJK/1Fuat7iFeFhm3gbjfVJz2S73RGAb5ObPQkbmut6g+KNT7ZDdF1E9ZdniwDaDmPHCgD ENTOwHwbW+ApZbM29FaQhW1ajjSyOJrBioh595AbDZr6z44MRR2nhYN8rA9HVpflrTqRjp oHCuqgxRN3TDK5muO+4iSqKVZBAXcWIzaRdgHzHPbvfJHP6ucn7i4nZw++eB/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765203463; a=rsa-sha256; cv=none; b=MJGez+JM3b+NSEjQSCasq3mHTR1ksm/2OwKll0eijg3g/kvMX6rRbTpXy4AmHy+a1r5phn RdpnfCALKNLMHPoWKGvTvQfnHn/42xWZa9xr6qmOGVO85NouOjPv0859ze9Qwh1q7fO2xU pyj6+zRT7L4C4iKiWbDnRoY8XcLhg78EZsxpGaVhnWJuixbTJ6B2DlfsAw6sxHjq9HSSuM vbBrtiYBOjgw7qBTjy/iBaOKcdElK/zBnEZhykYRnTSNVLkO7QMwrDI0K/nV0/0sdFEtbF RPsig6I+iqKrZ/AC+Fym3zA6V8AtxMKDCXzcDSiMT5lXv9f8zFGf4Y4ez+e4ug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dQ3wR0vQSz1N9 for ; Mon, 08 Dec 2025 14:17:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 302f4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 08 Dec 2025 14:17:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 1f9378a8eb69 - stable/15 - setaudit: Fix handling of numeric UIDs 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 1f9378a8eb698c14a97beb34483f6c1155619b58 Auto-Submitted: auto-generated Date: Mon, 08 Dec 2025 14:17:43 +0000 Message-Id: <6936de07.302f4.15bd68e6@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1f9378a8eb698c14a97beb34483f6c1155619b58 commit 1f9378a8eb698c14a97beb34483f6c1155619b58 Author: Mark Johnston AuthorDate: 2025-11-17 16:45:11 +0000 Commit: Mark Johnston CommitDate: 2025-12-08 14:14:58 +0000 setaudit: Fix handling of numeric UIDs The usage of strtoul() was incorrect. Reviewed by: csjp MFC after: 2 weeks Sponsored by: Modirum MDPay Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D53671 (cherry picked from commit 551191e14e223e1cbee5e9f72e08d4e2576b9127) --- usr.sbin/setaudit/setaudit.8 | 2 +- usr.sbin/setaudit/setaudit.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/usr.sbin/setaudit/setaudit.8 b/usr.sbin/setaudit/setaudit.8 index 8d0c8716ff73..7dc3e05a4473 100644 --- a/usr.sbin/setaudit/setaudit.8 +++ b/usr.sbin/setaudit/setaudit.8 @@ -45,7 +45,7 @@ Use IPv4. .It Fl 6 Use IPv6. .It Fl a Ar auid -Audit user ID. +Audit user ID or user name. .It Fl m Ar mask String representation of an audit mask. .It Fl s Ar source diff --git a/usr.sbin/setaudit/setaudit.c b/usr.sbin/setaudit/setaudit.c index bdf33ab4cf3d..adea52a83a8d 100644 --- a/usr.sbin/setaudit/setaudit.c +++ b/usr.sbin/setaudit/setaudit.c @@ -58,7 +58,7 @@ main(int argc, char *argv []) auditinfo_addr_t aia; struct addrinfo *res; struct passwd *pwd; - char *aflag, *mflag, *sflag, *r, *prog; + char *aflag, *mflag, *sflag, *prog; int ch, error; aflag = mflag = sflag = NULL; @@ -99,8 +99,10 @@ main(int argc, char *argv []) if (aflag) { pwd = getpwnam(aflag); if (pwd == NULL) { + char *r; + aia.ai_auid = strtoul(aflag, &r, 10); - if (r != NULL) + if (*r != '\0') errx(1, "%s: invalid user", aflag); } else aia.ai_auid = pwd->pw_uid;