[systemd-commits] 2 commits - src/conf-parser.c src/mount.c

[Lennart Poettering]

 src/conf-parser.c |    7 ++++++-
 src/mount.c       |    4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 9631c090fd61070797f3a6139f873a3cabc5d28a
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Mar 13 03:34:42 2012 +0100

    mount: fix assertion
    
    https://bugzilla.redhat.com/show_bug.cgi?id=768523

diff --git a/src/mount.c b/src/mount.c
index 982715a..ed0f819 100644
--- a/src/mount.c
+++ b/src/mount.c
@@ -189,7 +189,7 @@ static int mount_add_mount_links(Mount *m) {
                                 if ((r = unit_add_dependency(UNIT(n), UNIT_REQUIRES, UNIT(m), true)) < 0)
                                         return r;
 
-                } else if (pm && path_startswith(pm->what, n->where)) {
+                } else if (pm && pm->what && path_startswith(pm->what, n->where)) {
 
                         if ((r = unit_add_dependency(UNIT(m), UNIT_AFTER, UNIT(n), true)) < 0)
                                 return r;
@@ -197,7 +197,7 @@ static int mount_add_mount_links(Mount *m) {
                         if ((r = unit_add_dependency(UNIT(m), UNIT_REQUIRES, UNIT(n), true)) < 0)
                                 return r;
 
-                } else if (pn && path_startswith(pn->what, m->where)) {
+                } else if (pn && pn->what && path_startswith(pn->what, m->where)) {
 
                         if ((r = unit_add_dependency(UNIT(n), UNIT_AFTER, UNIT(m), true)) < 0)
                                 return r;

commit 62f168a05b5a0b81a75a50791b80ae700dd00afb
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Mar 13 02:41:29 2012 +0100

    conf-parser: warn if an assignment is place outside of a section
    
    https://bugzilla.redhat.com/show_bug.cgi?id=783134

diff --git a/src/conf-parser.c b/src/conf-parser.c
index 135b175..a9b0113 100644
--- a/src/conf-parser.c
+++ b/src/conf-parser.c
@@ -219,8 +219,13 @@ static int parse_line(
                 return 0;
         }
 
-        if (sections && !*section)
+        if (sections && !*section) {
+
+                if (!relaxed)
+                        log_info("[%s:%u] Assignment outside of section. Ignoring.", filename, line);
+
                 return 0;
+        }
 
         e = strchr(l, '=');
         if (!e) {