From 4919fe1352581a793d4817c06d0a9005fbbcc526 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 15 Jan 2019 17:15:48 +0100 Subject: [PATCH] user-util: remove unsed NOLEGACY define AFAICT, it was never hooked up to meson, so it'd only work if somebody manually defined the flag. I think it's preferable to drop the ifdef: it removes only a single access call to a fixed location, which is realy cheap. If poeple don't want to make use of this, they should just not create the file. Making this both compile-time optional and opt-in in the filesystem is unnecessary. --- src/basic/user-util.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/basic/user-util.c b/src/basic/user-util.c index 65738a760de..260f3d20576 100644 --- a/src/basic/user-util.c +++ b/src/basic/user-util.c @@ -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) { -- 2.47.3