From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 30 Nov 2018 23:47:22 +0000 (+0100)
Subject: Merge pull request #11006 from poettering/conf-file-fix
X-Git-Tag: v240~163
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2c8f15aecafdd6b9708f58b098437692ab37556f;p=thirdparty%2Fsystemd.git

Merge pull request #11006 from poettering/conf-file-fix

minor fixes for conf-files.c
---

2c8f15aecafdd6b9708f58b098437692ab37556f
diff --cc src/basic/conf-files.c
index 675746a944c,2d0073279f2..76750606b43
--- a/src/basic/conf-files.c
+++ b/src/basic/conf-files.c
@@@ -232,9 -233,9 +233,9 @@@ int conf_files_insert(char ***strv, con
                  /* … we are not there yet, let's continue */
          }
  
 -        t = path_join(root, path, NULL);
 +        t = path_join(root, path);
          if (!t)
-                 return log_oom();
+                 return -ENOMEM;
  
          r = strv_insert(strv, i, t);
          if (r < 0)