X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fdbus.c;h=0b93db55deda86d54b93815f8ed7ccd90c35d821;hp=7f8b6a05d5481ccad43184b8212e08cf476a16a5;hb=28322e1eb6507f2f40418e2dcdc6ee33e38ecee6;hpb=1e001f52d20a4685c9e8cf3cfa690021ca05c9e7 diff --git a/src/dbus.c b/src/dbus.c index 7f8b6a05d..0b93db55d 100644 --- a/src/dbus.c +++ b/src/dbus.c @@ -758,7 +758,6 @@ static void bus_new_connection( static int bus_init_system(Manager *m) { DBusError error; - char *id; int r; assert(m); @@ -800,10 +799,13 @@ static int bus_init_system(Manager *m) { goto fail; } - log_info("Successfully connected to system D-Bus bus %s as %s", - strnull((id = dbus_connection_get_server_id(m->system_bus))), - strnull(dbus_bus_get_unique_name(m->system_bus))); - dbus_free(id); + if (m->api_bus != m->system_bus) { + char *id; + log_info("Successfully connected to system D-Bus bus %s as %s", + strnull((id = dbus_connection_get_server_id(m->system_bus))), + strnull(dbus_bus_get_unique_name(m->system_bus))); + dbus_free(id); + } return 0; @@ -816,7 +818,6 @@ fail: static int bus_init_api(Manager *m) { DBusError error; - char *id; int r; assert(m); @@ -884,10 +885,13 @@ static int bus_init_api(Manager *m) { if ((r = query_name_list(m)) < 0) goto fail; - log_info("Successfully connected to API D-Bus bus %s as %s", - strnull((id = dbus_connection_get_server_id(m->api_bus))), - strnull(dbus_bus_get_unique_name(m->api_bus))); - dbus_free(id); + if (m->api_bus != m->system_bus) { + char *id; + log_info("Successfully connected to API D-Bus bus %s as %s", + strnull((id = dbus_connection_get_server_id(m->api_bus))), + strnull(dbus_bus_get_unique_name(m->api_bus))); + dbus_free(id); + } return 0;