commit fe9956300b1aa0ec69f29e8a10ad2cc932000765
author Ben Chan <benchan@chromium.org> Fri May 23 14:43:55 2014
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Sat May 24 00:39:02 2014
tree 68a206350015743b5afb923ab02d5558fab84e6b
parent b6df92f3accd4f5f8a8d367733522bb3305d0277

Prevent multiple instances of trunksd from running.

DBus::Connection::request_name() does not indicate whether it
successfully acquires the requested DBus name or not (chromium:364585).
This CL changes trunksd to use newly introduced
DBus::Connection::acquire_name() (CL:195002) to ensure that trunksd can
successfully acquire its DBus name.

BUG=None
TEST=Build and run unit tests.

Change-Id: I295479d183bd59a835024201f5fd04d0f57e1b5d
Reviewed-on: https://chromium-review.googlesource.com/201242
Tested-by: Ben Chan <benchan@chromium.org>
Commit-Queue: Ben Chan <benchan@chromium.org>
Reviewed-by: mukesh agrawal <quiche@chromium.org>

tss/trunksd.cc

diff --git a/tss/trunksd.cc b/tss/trunksd.cc
index d76edd5..4bd969c 100644
--- a/tss/trunksd.cc
+++ b/tss/trunksd.cc
@@ -27,7 +27,8 @@
 
   // Setup the trunks dbus service.
   DBus::Connection connection(DBus::Connection::SystemBus());
-  connection.request_name(trunks::kTrunksDbusServiceName);
+  CHECK(connection.acquire_name(trunks::kTrunksDbusServiceName))
+      << "Failed to acquire DBus name: " << trunks::kTrunksDbusServiceName;
   trunks::TrunksDbusService service(connection,
                                     DBus::Path(trunks::kTrunksDbusServicePath));