daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
803fb7
From 339b62c8f336bb51dc7a925062abeb3ce76145e6 Mon Sep 17 00:00:00 2001
803fb7
From: Martin Pitt <martin.pitt@ubuntu.com>
803fb7
Date: Thu, 5 Mar 2015 14:58:56 +0100
803fb7
Subject: [PATCH] tmpfiles: Fix handling of duplicate lines
803fb7
803fb7
Commit 3f93da987 accidentally dropped the "return 0" after detection of a
803fb7
duplicate line. Put it back, to get back the documented and intended "first
803fb7
match wins" behaviour.
803fb7
803fb7
https://launchpad.net/bugs/1428540
803fb7
(cherry picked from commit 6487ada88d63e4998113f4c57fa10b7c865f8026)
803fb7
---
803fb7
 src/tmpfiles/tmpfiles.c | 4 +++-
803fb7
 1 file changed, 3 insertions(+), 1 deletion(-)
803fb7
803fb7
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
803fb7
index 187997e1f..1e1096816 100644
803fb7
--- a/src/tmpfiles/tmpfiles.c
803fb7
+++ b/src/tmpfiles/tmpfiles.c
803fb7
@@ -1750,9 +1750,11 @@ static int parse_line(const char *fname, unsigned line, const char *buffer) {
803fb7
                 unsigned n;
803fb7
 
803fb7
                 for (n = 0; n < existing->count; n++) {
803fb7
-                        if (!item_compatible(existing->items + n, &i))
803fb7
+                        if (!item_compatible(existing->items + n, &i)) {
803fb7
                                 log_warning("[%s:%u] Duplicate line for path \"%s\", ignoring.",
803fb7
                                             fname, line, i.path);
803fb7
+                                return 0;
803fb7
+                        }
803fb7
                 }
803fb7
         } else {
803fb7
                 existing = new0(ItemArray, 1);