diff options
| author | Lennart Poettering <lennart@poettering.net> | 2021-05-06 15:46:30 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2021-05-07 22:19:07 +0200 |
| commit | 80d88a8267401387645166c22724e2ad912fade4 (patch) | |
| tree | bd487e8c109a0a96f4c31d496cf4084de43ffdca /src/nss-systemd | |
| parent | 0cd70d43a36d94b578004dfbf176007de3fd1f8a (diff) | |
| download | systemd-80d88a8267401387645166c22724e2ad912fade4.tar.gz | |
userdb: rename userdb lookup flags a bit
Let's use "exclude" for flags that really exclude records from our
lookup. Let's use "avoid" referring to concepts that when flag is set
we'll not use but we have a fallback path for that should yield the same
result. Let' use "suppress" for suppressing partial info, even if we
return the record otherwise.
So far we used "avoid" for all these cases, which was confusing.
Whiel we are at it, let's reassign the bits a bit, leaving some space
for bits follow-up commits are going to add.
Diffstat (limited to 'src/nss-systemd')
| -rw-r--r-- | src/nss-systemd/nss-systemd.c | 2 | ||||
| -rw-r--r-- | src/nss-systemd/userdb-glue.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/nss-systemd/nss-systemd.c b/src/nss-systemd/nss-systemd.c index 5592eaa3aa..14712f8735 100644 --- a/src/nss-systemd/nss-systemd.c +++ b/src/nss-systemd/nss-systemd.c @@ -582,7 +582,7 @@ enum nss_status _nss_systemd_initgroups_dyn( /* The group might be defined via traditional NSS only, hence let's do a full look-up without * disabling NSS. This means we are operating recursively here. */ - r = groupdb_by_name(group_name, (nss_glue_userdb_flags() & ~USERDB_AVOID_NSS) | USERDB_AVOID_SHADOW, &g); + r = groupdb_by_name(group_name, (nss_glue_userdb_flags() & ~USERDB_EXCLUDE_NSS) | USERDB_SUPPRESS_SHADOW, &g); if (r == -ESRCH) continue; if (r < 0) { diff --git a/src/nss-systemd/userdb-glue.c b/src/nss-systemd/userdb-glue.c index 8f8988579b..73941b2ba5 100644 --- a/src/nss-systemd/userdb-glue.c +++ b/src/nss-systemd/userdb-glue.c @@ -11,11 +11,11 @@ #include "userdb.h" UserDBFlags nss_glue_userdb_flags(void) { - UserDBFlags flags = USERDB_AVOID_NSS; + UserDBFlags flags = USERDB_EXCLUDE_NSS; /* Make sure that we don't go in circles when allocating a dynamic UID by checking our own database */ if (getenv_bool_secure("SYSTEMD_NSS_DYNAMIC_BYPASS") > 0) - flags |= USERDB_AVOID_DYNAMIC_USER; + flags |= USERDB_EXCLUDE_DYNAMIC_USER; return flags; } |