summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--hcid/main.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/hcid/main.c b/hcid/main.c
index f6167ed1..63bf0a2c 100644
--- a/hcid/main.c
+++ b/hcid/main.c
@@ -848,8 +848,6 @@ int main(int argc, char *argv[])
enable_debug();
}
- plugin_init();
-
/* Create and bind HCI socket */
if ((hcid.sock = socket(AF_BLUETOOTH, SOCK_RAW, BTPROTO_HCI)) < 0) {
error("Can't open HCI socket: %s (%d)",
@@ -902,6 +900,12 @@ int main(int argc, char *argv[])
exit(1);
}
+ /* Loading plugins has to be done after D-Bus has been setup since
+ * the plugins might wanna expose some paths on the bus. However the
+ * best order of how to init various subsystems of the Bluetooth
+ * daemon needs to be re-worked. */
+ plugin_init();
+
init_security_data();
/* Create event loop */