From nobody Tue Nov 18 16:24:42 2025 X-Original-To: dev-commits-src-main@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 4d9qhC1fxhz6HNYB for ; Tue, 18 Nov 2025 16:24: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 4d9qhB6Tqkz4JY8 for ; Tue, 18 Nov 2025 16:24:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763483082; 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=xTLwHNKf9E75N5skT7/24H9QD3ez2Srt9qrSaCdsPeI=; b=h2xf4lIQfzcl122wzAwrBA3Gxv2ypGIHnwPCmfMiP9olvAFo9idaLYNtBUvuFjD+7OEYHq zfvtKqBW/5bFKmW1oe6427XZ3TjqP6JmLjm/DWJxpZQvq4QMVMWbRzj0BZxrIxqNOB2HFr dhM19cGFtyxgjcvIGj7hz0bP6baWlwyocBqJle9hApGphHQye+wrq56sNHMKVpHCA8moK8 h5FJ1d4B/rGgvQTuk6rsiTOrV7S5tfEa52/Mi1gWCCu5e3+ju+n9WEW1bECUYLCqck9YxL 8994Tcw9oaBlfUx3mKooP220wyx5/dgSbYNPqZa5SuG2LmmSESalhMKOj7mfJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763483082; 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=xTLwHNKf9E75N5skT7/24H9QD3ez2Srt9qrSaCdsPeI=; b=TLR3lkh8GgACuZLHnQ5JV0fSQk9zc7e0wE791HjyITW1zP350sFBEfQTa0xkVz2c3QL7eA yL+ITjXoGL6N6O9jq9w8stei3AGoxNS+BcLnM802Y3WwfG13Tdk19EuvDSPRry4AfL8yEg YSahkjcStp3Jeb4FZyIWmr1m5bROnE/HQeq/B2xu+eqeDD9Uio6X5YZfoPt94j1ayVFBGD KdqbkU79knOKUPvWVCq17r1gMz1bJoVbc3dWWBOmvxj6alKBYiUn3NTtmJVLnIZPLttZZo 1s4RI+6r1zaCQDJTKT3kse2yiWhARUSSapah8A7yfc1T2qyuXVq10qHj1gNhpw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763483082; a=rsa-sha256; cv=none; b=rqAXmfVESJSKC9zARSMJaITFCf5pJYvCL+LK2OoFipAwr0hlw8kWwueAy+Is4KdTgEjeBW LZVYtnhby67xm13YkBV3fBY1Liw9pf8T34MadZNEg0QfpWDaGwzVW09Zypk7o2AdzA+wqv jxruPGrAzfw1O7zgF+ZWjfVclZC5HfUiAV/IFWP94942THoBUxU7aRc5vd+Mzlq2PWSk8S 2NLU9y01P9GjghbXYGKu3FXC6hebKFYsPWRef7kFzokoTPBez2Futxxoq/qQ0+lJ231F7M +gH1MO/oa8bH3VIuBdTNIkZA2u1+Krhj3G0YlwFLiaBqtX7I2dSCn+rkG8OfOA== 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 4d9qhB643fz11R0 for ; Tue, 18 Nov 2025 16:24:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3dbe3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 16:24:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 551191e14e22 - main - setaudit: Fix handling of numeric UIDs List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 551191e14e223e1cbee5e9f72e08d4e2576b9127 Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 16:24:42 +0000 Message-Id: <691c9dca.3dbe3.6c10da94@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=551191e14e223e1cbee5e9f72e08d4e2576b9127 commit 551191e14e223e1cbee5e9f72e08d4e2576b9127 Author: Mark Johnston AuthorDate: 2025-11-17 16:45:11 +0000 Commit: Mark Johnston CommitDate: 2025-11-18 16:24:20 +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 --- 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;