From 71265e69fa8a26d8a9669824eeb3ea9d2fe7c923 Mon Sep 17 00:00:00 2001

From: Martin Pitt <martin.pitt@ubuntu.com>

Date: Thu, 5 Mar 2015 14:58:56 +0100

Subject: [PATCH] tmpfiles: Fix handling of duplicate lines

Commit 3f93da987 accidentally dropped the "return 0" after detection of a

duplicate line. Put it back, to get back the documented and intended "first

match wins" behaviour.

https://launchpad.net/bugs/1428540

(cherry picked from commit 6487ada88d63e4998113f4c57fa10b7c865f8026)

---

 src/tmpfiles/tmpfiles.c | 4 +++-

 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c

index 187997e1f4..1e10968164 100644

--- a/src/tmpfiles/tmpfiles.c

+++ b/src/tmpfiles/tmpfiles.c

@@ -1750,9 +1750,11 @@ static int parse_line(const char *fname, unsigned line, const char *buffer) {

                 unsigned n;

                 for (n = 0; n < existing->count; n++) {

-                        if (!item_compatible(existing->items + n, &i))

+                        if (!item_compatible(existing->items + n, &i)) {

                                 log_warning("[%s:%u] Duplicate line for path \"%s\", ignoring.",

                                             fname, line, i.path);

+                                return 0;

+                        }

                 }

         } else {

                 existing = new0(ItemArray, 1);