Merge pull request #11450 from keszybz/drop-nolegacy

Drop unused NOLEGACY define

diff --git a/src/basic/env-util.c b/src/basic/env-util.c
index e494f65c9879801736a77ec3d29dda214ed69f7a..fd449dcce07d1c0badf7f5b614646b04751c66a1 100644 (file)
--- a/src/basic/env-util.c
+++ b/src/basic/env-util.c
@@ -339,7 +339,6 @@ char **strv_env_unset(char **l, const char *p) {
 }
 
 char **strv_env_unset_many(char **l, ...) {
-
         char **f, **t;
 
         if (!l)
@@ -408,7 +407,6 @@ int strv_env_replace(char ***l, char *p) {
 }
 
 char **strv_env_set(char **x, const char *p) {
-
         _cleanup_strv_free_ char **ret = NULL;
         size_t n, m;
         char **k;

diff --git a/src/basic/user-util.c b/src/basic/user-util.c
index 65738a760de27df66832c02cc50ad7b9c5c3d6a1..260f3d20576baa2175c9230e50028ecbd2db4298 100644 (file)
--- 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) {