diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2020-04-11 16:08:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-11 16:08:33 +0200 |
| commit | 2d9123cebddfee7cff3052061517c495c5e359cd (patch) | |
| tree | c2af1810cd0baf0ce801e4e26aba63eb2a0649af /src/shared/userdb.c | |
| parent | edc8dd26e27976e0cf06cbf5f97033b3128fc696 (diff) | |
| parent | b062ca616c778358d4da008a2950615fac74aa24 (diff) | |
| download | systemd-2d9123cebddfee7cff3052061517c495c5e359cd.tar.gz | |
Merge pull request #15377 from poettering/userdb-no-shadow
don't try to access shadow from logind
Diffstat (limited to 'src/shared/userdb.c')
| -rw-r--r-- | src/shared/userdb.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/shared/userdb.c b/src/shared/userdb.c index 0769a792c2..c3a6e02e5a 100644 --- a/src/shared/userdb.c +++ b/src/shared/userdb.c @@ -614,7 +614,7 @@ int userdb_by_name(const char *name, UserDBFlags flags, UserRecord **ret) { iterator->nss_lock = r; /* Client-side NSS fallback */ - r = nss_user_record_by_name(name, ret); + r = nss_user_record_by_name(name, !FLAGS_SET(flags, USERDB_AVOID_SHADOW), ret); if (r >= 0) return r; } @@ -661,7 +661,7 @@ int userdb_by_uid(uid_t uid, UserDBFlags flags, UserRecord **ret) { iterator->nss_lock = r; /* Client-side NSS fallback */ - r = nss_user_record_by_uid(uid, ret); + r = nss_user_record_by_uid(uid, !FLAGS_SET(flags, USERDB_AVOID_SHADOW), ret); if (r >= 0) return r; } @@ -819,7 +819,7 @@ int groupdb_by_name(const char *name, UserDBFlags flags, GroupRecord **ret) { if (r >= 0 || r == -EBUSY) { iterator->nss_lock = r; - r = nss_group_record_by_name(name, ret); + r = nss_group_record_by_name(name, !FLAGS_SET(flags, USERDB_AVOID_SHADOW), ret); if (r >= 0) return r; } @@ -865,7 +865,7 @@ int groupdb_by_gid(gid_t gid, UserDBFlags flags, GroupRecord **ret) { if (r >= 0 || r == -EBUSY) { iterator->nss_lock = r; - r = nss_group_record_by_gid(gid, ret); + r = nss_group_record_by_gid(gid, !FLAGS_SET(flags, USERDB_AVOID_SHADOW), ret); if (r >= 0) return r; } @@ -1046,7 +1046,7 @@ int membershipdb_by_group(const char *name, UserDBFlags flags, UserDBIterator ** return iterator->nss_lock; /* We ignore all errors here, since the group might be defined by a userdb native service, and we queried them already above. */ - (void) nss_group_record_by_name(name, &gr); + (void) nss_group_record_by_name(name, false, &gr); if (gr) { iterator->members_of_group = strv_copy(gr->members); if (!iterator->members_of_group) |