SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

user-util: honour PREFER_NSS flag in get_group_creds() the same way as we already do in get_user_creds()

Browse Source 
let's onour the PREFER_NSS flag also in get_group_creds() the same
way we honour it in get_user_creds().

Simply to remove surprises.
This commit is contained in:
Lennart Poettering
2024-01-16 14:56:25 +01:00
parent 83e9b584db
commit e9c974fd42
1 changed files with 32 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/basic/user-util.c
+32 -7
View File
@@ -338,15 +338,13 @@ int get_user_creds(
return 0;
}
int get_group_creds(const char **groupname, gid_t *ret_gid, UserCredsFlags flags) {
bool patch_groupname = false;
struct group *g;
gid_t id;
static int synthesize_group_creds(
const char **groupname,
gid_t *ret_gid) {
assert(groupname);
assert(*groupname);
/* We enforce some special rules for gid=0: in order to avoid NSS lookups for root we hardcode its data. */
if (STR_IN_SET(*groupname, "root", "0")) {
*groupname = "root";
@@ -366,6 +364,26 @@ int get_group_creds(const char **groupname, gid_t *ret_gid, UserCredsFlags flags
return 0;
}
return -ENOMEDIUM;
}
int get_group_creds(const char **groupname, gid_t *ret_gid, UserCredsFlags flags) {
bool patch_groupname = false;
struct group *g;
gid_t id;
int r;
assert(groupname);
assert(*groupname);
if (!FLAGS_SET(flags, USER_CREDS_PREFER_NSS)) {
r = synthesize_group_creds(groupname, ret_gid);
if (r >= 0)
return 0;
if (r != -ENOMEDIUM) /* not a groupname we can synthesize */
return r;
}
if (parse_gid(*groupname, &id) >= 0) {
errno = 0;
g = getgrgid(id);
@@ -383,10 +401,17 @@ int get_group_creds(const char **groupname, gid_t *ret_gid, UserCredsFlags flags
g = getgrnam(*groupname);
}
if (!g)
if (!g) {
/* getgrnam() may fail with ENOENT if /etc/group is missing.
* For us that is equivalent to the name not being defined. */
return IN_SET(errno, 0, ENOENT) ? -ESRCH : -errno;
r = IN_SET(errno, 0, ENOENT) ? -ESRCH : -errno;
if (FLAGS_SET(flags, USER_CREDS_PREFER_NSS))
if (synthesize_group_creds(groupname, ret_gid) >= 0)
return 0;
return r;
}
if (ret_gid) {
if (!gid_is_valid(g->gr_gid))