[systemd-commits] src/tmpfiles

[Martin Pitt]

 src/tmpfiles/tmpfiles.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 6487ada88d63e4998113f4c57fa10b7c865f8026
Author: Martin Pitt <martin.pitt at ubuntu.com>
Date:   Thu Mar 5 14:58:56 2015 +0100

    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

diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
index 917bb3c..652fe5f 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -1746,9 +1746,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);