logind: support for hybrid sleep (i.e. suspend+hibernate at the same time)

[elogind.git] / src / core / load-dropin.c

diff --git a/src/core/load-dropin.c b/src/core/load-dropin.c
index d869ee0c7650cd347d840be325433574e82aa873..86f81c7484ea6674c4661f2252130800fe5c0d26 100644 (file)
--- a/src/core/load-dropin.c
+++ b/src/core/load-dropin.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/>.
 ***/
 
@@ -51,7 +51,7 @@ static int iterate_dir(Unit *u, const char *path, UnitDependency dependency) {
                 if (ignore_file(de->d_name))
                         continue;
 
-                f = join(path, "/", de->d_name, NULL);
+                f = strjoin(path, "/", de->d_name, NULL);
                 if (!f) {
                         r = -ENOMEM;
                         goto finish;
@@ -80,7 +80,7 @@ static int process_dir(Unit *u, const char *unit_path, const char *name, const c
         assert(name);
         assert(suffix);
 
-        path = join(unit_path, "/", name, suffix, NULL);
+        path = strjoin(unit_path, "/", name, suffix, NULL);
         if (!path)
                 return -ENOMEM;
 
@@ -102,7 +102,7 @@ static int process_dir(Unit *u, const char *unit_path, const char *name, const c
                 if (!template)
                         return -ENOMEM;
 
-                path = join(unit_path, "/", template, suffix, NULL);
+                path = strjoin(unit_path, "/", template, suffix, NULL);
                 free(template);
 
                 if (!path)