X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fdbus-path.c;h=15238798ae5d7dffbc44b2f54fa594e1c459db63;hp=c8c302ab3737cbbd91539abe7e2312c0cfd78400;hb=a75560529663e5fd055884e32ab9c73f47f8aaa5;hpb=c4e2ceae941d02de5574becbfd3b4db15de2eda3

diff --git a/src/dbus-path.c b/src/dbus-path.c
index c8c302ab3..15238798a 100644
--- a/src/dbus-path.c
+++ b/src/dbus-path.c
@@ -24,11 +24,14 @@
 #include "dbus-unit.h"
 #include "dbus-path.h"
 #include "dbus-execute.h"
+#include "dbus-common.h"
 
 #define BUS_PATH_INTERFACE                                              \
         " <interface name=\"org.freedesktop.systemd1.Path\">\n"         \
         "  <property name=\"Unit\" type=\"s\" access=\"read\"/>\n"      \
         "  <property name=\"Paths\" type=\"a(ss)\" access=\"read\"/>\n" \
+        "  <property name=\"MakeDirectory\" type=\"b\" access=\"read\"/>\n" \
+        "  <property name=\"DirectoryMode\" type=\"u\" access=\"read\"/>\n" \
         " </interface>\n"
 
 #define INTROSPECTION                                                   \
@@ -41,14 +44,17 @@
         BUS_INTROSPECTABLE_INTERFACE                                    \
         "</node>\n"
 
-const char bus_path_interface[] = BUS_PATH_INTERFACE;
+#define INTERFACES_LIST                              \
+        BUS_UNIT_INTERFACES_LIST                     \
+        "org.freedesktop.systemd1.Path\0"
 
-static int bus_path_append_paths(Manager *m, DBusMessageIter *i, const char *property, void *data) {
+const char bus_path_interface[] _introspect_("Path") = BUS_PATH_INTERFACE;
+
+static int bus_path_append_paths(DBusMessageIter *i, const char *property, void *data) {
         Path *p = data;
         DBusMessageIter sub, sub2;
         PathSpec *k;
 
-        assert(m);
         assert(i);
         assert(property);
         assert(p);
@@ -72,13 +78,28 @@ static int bus_path_append_paths(Manager *m, DBusMessageIter *i, const char *pro
         return 0;
 }
 
+static int bus_path_append_unit(DBusMessageIter *i, const char *property, void *data) {
+        Unit *u = data;
+        const char *t;
+
+        assert(i);
+        assert(property);
+        assert(u);
+
+        t = u->path.unit ? u->path.unit->meta.id : "";
+
+        return dbus_message_iter_append_basic(i, DBUS_TYPE_STRING, &t) ? 0 : -ENOMEM;
+}
+
 DBusHandlerResult bus_path_message_handler(Unit *u, DBusConnection *c, DBusMessage *message) {
         const BusProperty properties[] = {
                 BUS_UNIT_PROPERTIES,
-                { "org.freedesktop.systemd1.Path", "Unit",  bus_property_append_string, "s",     u->path.unit->meta.id  },
-                { "org.freedesktop.systemd1.Path", "Paths", bus_path_append_paths,      "a(ss)", u                      },
+                { "org.freedesktop.systemd1.Path", "Unit",          bus_path_append_unit,     "s",     u                        },
+                { "org.freedesktop.systemd1.Path", "Paths",         bus_path_append_paths,    "a(ss)", u                        },
+                { "org.freedesktop.systemd1.Path", "MakeDirectory", bus_property_append_bool, "b",     &u->path.make_directory  },
+                { "org.freedesktop.systemd1.Path", "DirectoryMode", bus_property_append_mode, "u",     &u->path.directory_mode  },
                 { NULL, NULL, NULL, NULL, NULL }
         };
 
-        return bus_default_message_handler(u->meta.manager, c, message, INTROSPECTION, properties);
+        return bus_default_message_handler(c, message, INTROSPECTION, INTERFACES_LIST, properties);
 }