summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYu Watanabe <watanabe.yu+github@gmail.com>2020-03-02 15:18:13 +0900
committerGitHub <noreply@github.com>2020-03-02 15:18:13 +0900
commited87ce1d5d93e10fb712e3839606248a7d20a1ce (patch)
treedd93d7085ce49905fd51146e0d90be4583189dda
parentf4665664c4ff69a3666fabc220535fced1544fa8 (diff)
parent6f22d572352793667f4b14b2cbc8c3a9e2caee05 (diff)
downloadsystemd-ed87ce1d5d93e10fb712e3839606248a7d20a1ce.tar.gz
Merge pull request #14990 from keszybz/nss-homed-fix
Fix for lookup of groups defined by homed
-rw-r--r--src/home/home-util.c2
-rw-r--r--src/nss-systemd/nss-systemd.c2
-rw-r--r--src/nss-systemd/userdb-glue.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/home/home-util.c b/src/home/home-util.c
index 132e54b39b..a53b0d3391 100644
--- a/src/home/home-util.c
+++ b/src/home/home-util.c
@@ -12,7 +12,7 @@
bool suitable_user_name(const char *name) {
- /* Checks whether the specified name is suitable for management via home aread. Note that client-side
+ /* Checks whether the specified name is suitable for management via homed. Note that client-side
* we usually validate with the simple valid_user_group_name(), while server-side we are a bit more
* restrictive, so that we can change the rules server-side without having to update things
* client-side too. */
diff --git a/src/nss-systemd/nss-systemd.c b/src/nss-systemd/nss-systemd.c
index 34f886a8cc..9c004616f5 100644
--- a/src/nss-systemd/nss-systemd.c
+++ b/src/nss-systemd/nss-systemd.c
@@ -195,7 +195,7 @@ enum nss_status _nss_systemd_getgrnam_r(
if (!valid_user_group_name(name))
return NSS_STATUS_NOTFOUND;
- /* Synthesize records for root and nobody, in case they are missing form /etc/group */
+ /* Synthesize records for root and nobody, in case they are missing from /etc/group */
if (getenv_bool_secure("SYSTEMD_NSS_BYPASS_SYNTHETIC") <= 0) {
if (streq(name, root_group.gr_name)) {
diff --git a/src/nss-systemd/userdb-glue.c b/src/nss-systemd/userdb-glue.c
index 81705fa1b6..58915c3d23 100644
--- a/src/nss-systemd/userdb-glue.c
+++ b/src/nss-systemd/userdb-glue.c
@@ -290,7 +290,7 @@ enum nss_status userdb_getgrgid(
*errnop = -r;
return NSS_STATUS_UNAVAIL;
}
- if (r)
+ if (!r)
return NSS_STATUS_NOTFOUND;
r = groupdb_by_gid(gid, nss_glue_userdb_flags(), &g);