X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fhostnamed.c;h=d05c9023c75cd658f8fc52f8e693bc47d7934ba2;hp=f579e112ad1a4b82b65d46073a1fb043e5f91535;hb=91f9dcaf9270fe465525638cc08bd94590273349;hpb=05a4abb9146eebd75f5d9b9cac38f183818a9f6d

diff --git a/src/hostnamed.c b/src/hostnamed.c
index f579e112a..d05c9023c 100644
--- a/src/hostnamed.c
+++ b/src/hostnamed.c
@@ -31,9 +31,7 @@
 #include "dbus-common.h"
 #include "polkit.h"
 
-#define INTROSPECTION                                                   \
-        DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE                       \
-        "<node>\n"                                                      \
+#define INTERFACE \
         " <interface name=\"org.freedesktop.hostname1\">\n"             \
         "  <property name=\"Hostname\" type=\"s\" access=\"read\"/>\n"  \
         "  <property name=\"StaticHostname\" type=\"s\" access=\"read\"/>\n" \
@@ -55,7 +53,12 @@
         "   <arg name=\"name\" type=\"s\" direction=\"in\"/>\n"         \
         "   <arg name=\"user_interaction\" type=\"b\" direction=\"in\"/>\n" \
         "  </method>\n"                                                 \
-        " </interface>\n"                                               \
+        " </interface>\n"
+
+#define INTROSPECTION                                                   \
+        DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE                       \
+        "<node>\n"                                                      \
+        INTERFACE                                                       \
         BUS_PROPERTIES_INTERFACE                                        \
         BUS_INTROSPECTABLE_INTERFACE                                    \
         BUS_PEER_INTERFACE                                              \
@@ -65,6 +68,8 @@
         BUS_GENERIC_INTERFACES_LIST             \
         "org.freedesktop.hostname1\0"
 
+const char hostname_interface[] _introspect_("hostname1") = INTERFACE;
+
 enum {
         PROP_HOSTNAME,
         PROP_STATIC_HOSTNAME,
@@ -547,6 +552,14 @@ int main(int argc, char *argv[]) {
         log_parse_environment();
         log_open();
 
+        if (argc == 2 && streq(argv[1], "--introspect")) {
+                fputs(DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE
+                      "<node>\n", stdout);
+                fputs(hostname_interface, stdout);
+                fputs("</node>\n", stdout);
+                return 0;
+        }
+
         if (argc != 1) {
                 log_error("This program takes no arguments.");
                 r = -EINVAL;