From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 22 Nov 2013 00:51:19 +0000 (+0100)
Subject: bus: deal with duplicate values from enumerators
X-Git-Tag: v209~1341
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=52c7f2b2d58394c791ea0c6cf706082fd418f5bc;p=thirdparty%2Fsystemd.git

bus: deal with duplicate values from enumerators
---

diff --git a/src/libsystemd-bus/bus-objects.c b/src/libsystemd-bus/bus-objects.c
index 7c8a774e73f..659f7cec831 100644
--- a/src/libsystemd-bus/bus-objects.c
+++ b/src/libsystemd-bus/bus-objects.c
@@ -135,6 +135,8 @@ static int add_enumerated_to_set(
                         }
 
                         r = set_consume(s, *k);
+                        if (r == -EEXIST)
+                                r = 0;
                 }
 
                 free(children);