diff options
Diffstat (limited to 'src/basic/user-util.c')
| -rw-r--r-- | src/basic/user-util.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/basic/user-util.c b/src/basic/user-util.c index d410c9068b..260f3d2057 100644 --- a/src/basic/user-util.c +++ b/src/basic/user-util.c @@ -87,7 +87,7 @@ char *getusername_malloc(void) { return uid_to_name(getuid()); } -static inline bool is_nologin_shell(const char *shell) { +static bool is_nologin_shell(const char *shell) { return PATH_IN_SET(shell, /* 'nologin' is the friendliest way to disable logins for a user account. It prints a nice @@ -733,10 +733,6 @@ int maybe_setgroups(size_t size, const gid_t *list) { } bool synthesize_nobody(void) { - -#ifdef NOLEGACY - return true; -#else /* Returns true when we shall synthesize the "nobody" user (which we do by default). This can be turned off by * touching /etc/systemd/dont-synthesize-nobody in order to provide upgrade compatibility with legacy systems * that used the "nobody" user name and group name for other UIDs/GIDs than 65534. @@ -750,7 +746,6 @@ bool synthesize_nobody(void) { cache = access("/etc/systemd/dont-synthesize-nobody", F_OK) < 0; return cache; -#endif } int putpwent_sane(const struct passwd *pw, FILE *stream) { |