core: expose missing busname properties on the bus

diff --git a/src/core/busname.h b/src/core/busname.h
index 0009c6a65e2330d40c99b34f6783b9e446110600..ab3082bb05ed8ba3d2b8ee9e92cf96120ceb7c1b 100644 (file)
--- a/src/core/busname.h
+++ b/src/core/busname.h
@@ -49,7 +49,9 @@ struct BusName {
 
         char *name;
         int starter_fd;
 
         char *name;
         int starter_fd;

+

         bool activating;
         bool activating;

+        bool accept_fd;

 
         UnitRef service;
 
 
         UnitRef service;
 


@@ -58,8 +60,6 @@ struct BusName {
 
         sd_event_source *event_source;
 
 
         sd_event_source *event_source;
 

-        bool accept_fd;
-

         LIST_HEAD(BusNamePolicy, policy);
 };
 
         LIST_HEAD(BusNamePolicy, policy);
 };
 

diff --git a/src/core/dbus-busname.c b/src/core/dbus-busname.c
index 854491b2ee60765b3a520e83a9546aeee0807429..5dd3a5e1ec184585a5e3e8cf4fc7f16493f0cf3e 100644 (file)
--- a/src/core/dbus-busname.c
+++ b/src/core/dbus-busname.c
@@ -31,5 +31,7 @@ const sd_bus_vtable bus_busname_vtable[] = {
         SD_BUS_VTABLE_START(0),
         SD_BUS_PROPERTY("Name", "s", NULL, offsetof(BusName, name), SD_BUS_VTABLE_PROPERTY_CONST),
         SD_BUS_PROPERTY("Result", "s", property_get_result, offsetof(BusName, result), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
         SD_BUS_VTABLE_START(0),
         SD_BUS_PROPERTY("Name", "s", NULL, offsetof(BusName, name), SD_BUS_VTABLE_PROPERTY_CONST),
         SD_BUS_PROPERTY("Result", "s", property_get_result, offsetof(BusName, result), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),

+        SD_BUS_PROPERTY("Activating", "b", bus_property_get_bool, offsetof(BusName, activating), SD_BUS_VTABLE_PROPERTY_CONST),
+        SD_BUS_PROPERTY("AcceptFileDescriptors", "b", bus_property_get_bool, offsetof(BusName, accept_fd), SD_BUS_VTABLE_PROPERTY_CONST),

         SD_BUS_VTABLE_END
 };
         SD_BUS_VTABLE_END
 };