env: considerably beef up environment cleaning logic

[elogind.git] / src / binfmt / binfmt.c

diff --git a/src/binfmt/binfmt.c b/src/binfmt/binfmt.c
index 3c8d815d6452f433b46bb6367d54b8aaaebbbc7e..296607d6a270f7e017a3ee8992d9e5a12a4f74b5 100644 (file)
--- a/src/binfmt/binfmt.c
+++ b/src/binfmt/binfmt.c
@@ -6,16 +6,16 @@
   Copyright 2010 Lennart Poettering
 
   systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
+  under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or
   (at your option) any later version.
 
   systemd is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
+  Lesser General Public License for more details.
 
-  You should have received a copy of the GNU General Public License
+  You should have received a copy of the GNU Lesser General Public License
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
@@ -31,6 +31,7 @@
 #include "hashmap.h"
 #include "strv.h"
 #include "util.h"
+#include "conf-files.h"
 
 static int delete_rule(const char *rule) {
         char *x, *fn = NULL, *e;
@@ -39,7 +40,7 @@ static int delete_rule(const char *rule) {
         assert(rule[0]);
 
         if (!(x = strdup(rule)))
-                return -ENOMEM;
+                return log_oom();
 
         e = strchrnul(x+1, x[0]);
         *e = 0;
@@ -48,7 +49,7 @@ static int delete_rule(const char *rule) {
         free(x);
 
         if (!fn)
-                return -ENOMEM;
+                return log_oom();
 
         r = write_one_line_file(fn, "-1");
         free(fn);
@@ -137,7 +138,7 @@ int main(int argc, char *argv[]) {
         } else {
                 char **files, **f;
 
-                r = conf_files_list(&files, ".conf",
+                r = conf_files_list(&files, ".conf", NULL,
                                     "/etc/binfmt.d",
                                     "/run/binfmt.d",
                                     "/usr/local/lib/binfmt.d",