Date: Mon, 08 Dec 2025 14:17:43 +0000 From: Mark Johnston <markj@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 1f9378a8eb69 - stable/15 - setaudit: Fix handling of numeric UIDs Message-ID: <6936de07.302f4.15bd68e6@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1f9378a8eb698c14a97beb34483f6c1155619b58 commit 1f9378a8eb698c14a97beb34483f6c1155619b58 Author: Mark Johnston <markj@FreeBSD.org> AuthorDate: 2025-11-17 16:45:11 +0000 Commit: Mark Johnston <markj@FreeBSD.org> 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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6936de07.302f4.15bd68e6>