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

minor fixes for conf-files.c

diff --cc src/basic/conf-files.c
index 675746a,2d00732..7675060
--- 1/src/basic/conf-files.c
--- 2/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)