Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 3 Nov 2024 18:37:45 GMT
From:      Ed Maste <emaste@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: ba10bfe509dc - main - libbsm: honour AU_OFLAG_NORESOLVE
Message-ID:  <202411031837.4A3Ibjge097460@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by emaste:

URL: https://cgit.FreeBSD.org/src/commit/?id=ba10bfe509dcb5d408de89c886527035068b8f17

commit ba10bfe509dcb5d408de89c886527035068b8f17
Author:     Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2024-10-23 12:25:29 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
CommitDate: 2024-11-03 18:37:24 +0000

    libbsm: honour AU_OFLAG_NORESOLVE
    
    AU_OFLAG_NORESOLVE is documented as "Leave user and group IDs in their
    numeric form" but it was not actually tested.
    
    OpenBSM pull request at https://github.com/openbsm/openbsm/pull/85
    
    PR:             282271
    Sponsored by:   The FreeBSD Foundation
    Differential Revision: https://reviews.freebsd.org/D47263
---
 contrib/openbsm/libbsm/bsm_io.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/openbsm/libbsm/bsm_io.c b/contrib/openbsm/libbsm/bsm_io.c
index 4b89ccb8b59c..f0b3e4a1a2df 100644
--- a/contrib/openbsm/libbsm/bsm_io.c
+++ b/contrib/openbsm/libbsm/bsm_io.c
@@ -644,7 +644,7 @@ print_user(FILE *fp, u_int32_t usr, int oflags)
 {
 	struct passwd *pwent;
 
-	if (oflags & AU_OFLAG_RAW)
+	if (oflags & (AU_OFLAG_RAW | AU_OFLAG_NORESOLVE))
 		fprintf(fp, "%d", usr);
 	else {
 		pwent = getpwuid(usr);
@@ -663,7 +663,7 @@ print_group(FILE *fp, u_int32_t grp, int oflags)
 {
 	struct group *grpent;
 
-	if (oflags & AU_OFLAG_RAW)
+	if (oflags & (AU_OFLAG_RAW | AU_OFLAG_NORESOLVE))
 		fprintf(fp, "%d", grp);
 	else {
 		grpent = getgrgid(grp);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202411031837.4A3Ibjge097460>