localed: port from libdbus to libsystemd-bus

2 files changed, 469 insertions, 706 deletions

diff --git a/Makefile.am b/Makefile.am
index 379e87856a..209f9cb63a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3497,15 +3497,11 @@ if ENABLE_LOCALED
 systemd_localed_SOURCES = \
 	src/locale/localed.c
 
-systemd_localed_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(DBUS_CFLAGS)
-
 systemd_localed_LDADD = \
 	libsystemd-label.la \
 	libsystemd-shared.la \
 	libsystemd-daemon.la \
-	libsystemd-dbus.la
+	libsystemd-bus.la
 
 nodist_systemunit_DATA += \
 	units/systemd-localed.service
diff --git a/src/locale/localed.c b/src/locale/localed.c
index 0b5f97ee8b..2d9891a6d2 100644
--- a/src/locale/localed.c
+++ b/src/locale/localed.c
@@ -4,6 +4,7 @@
   This file is part of systemd.
 
   Copyright 2011 Lennart Poettering
+  Copyright 2013 Kay Sievers
 
   systemd is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as published by
@@ -19,117 +20,77 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <dbus/dbus.h>
-
 #include <errno.h>
 #include <string.h>
 #include <unistd.h>
 
+#include "sd-bus.h"
+
 #include "util.h"
 #include "mkdir.h"
 #include "strv.h"
-#include "dbus-common.h"
-#include "polkit.h"
 #include "def.h"
 #include "env-util.h"
 #include "fileio.h"
 #include "fileio-label.h"
 #include "label.h"
-
-#define INTERFACE                                                       \
-        " <interface name=\"org.freedesktop.locale1\">\n"               \
-        "  <property name=\"Locale\" type=\"as\" access=\"read\"/>\n"   \
-        "  <property name=\"VConsoleKeymap\" type=\"s\" access=\"read\"/>\n" \
-        "  <property name=\"VConsoleKeymapToggle\" type=\"s\" access=\"read\"/>\n" \
-        "  <property name=\"X11Layout\" type=\"s\" access=\"read\"/>\n" \
-        "  <property name=\"X11Model\" type=\"s\" access=\"read\"/>\n"  \
-        "  <property name=\"X11Variant\" type=\"s\" access=\"read\"/>\n" \
-        "  <property name=\"X11Options\" type=\"s\" access=\"read\"/>\n" \
-        "  <method name=\"SetLocale\">\n"                               \
-        "   <arg name=\"locale\" type=\"as\" direction=\"in\"/>\n"      \
-        "   <arg name=\"user_interaction\" type=\"b\" direction=\"in\"/>\n" \
-        "  </method>\n"                                                 \
-        "  <method name=\"SetVConsoleKeyboard\">\n"                      \
-        "   <arg name=\"keymap\" type=\"s\" direction=\"in\"/>\n"       \
-        "   <arg name=\"keymap_toggle\" type=\"s\" direction=\"in\"/>\n" \
-        "   <arg name=\"convert\" type=\"b\" direction=\"in\"/>\n"      \
-        "   <arg name=\"user_interaction\" type=\"b\" direction=\"in\"/>\n" \
-        "  </method>\n"                                                 \
-        "  <method name=\"SetX11Keyboard\">\n"                          \
-        "   <arg name=\"layout\" type=\"s\" direction=\"in\"/>\n"       \
-        "   <arg name=\"model\" type=\"s\" direction=\"in\"/>\n"        \
-        "   <arg name=\"variant\" type=\"s\" direction=\"in\"/>\n"      \
-        "   <arg name=\"options\" type=\"s\" direction=\"in\"/>\n"      \
-        "   <arg name=\"convert\" type=\"b\" direction=\"in\"/>\n"      \
-        "   <arg name=\"user_interaction\" type=\"b\" direction=\"in\"/>\n" \
-        "  </method>\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                                              \
-        "</node>\n"
-
-#define INTERFACES_LIST                         \
-        BUS_GENERIC_INTERFACES_LIST             \
-        "org.freedesktop.locale1\0"
-
-const char locale_interface[] = INTERFACE;
+#include "bus-util.h"
+#include "bus-error.h"
+#include "bus-message.h"
+#include "event-util.h"
 
 enum {
         /* We don't list LC_ALL here on purpose. People should be
          * using LANG instead. */
-
-        PROP_LANG,
-        PROP_LANGUAGE,
-        PROP_LC_CTYPE,
-        PROP_LC_NUMERIC,
-        PROP_LC_TIME,
-        PROP_LC_COLLATE,
-        PROP_LC_MONETARY,
-        PROP_LC_MESSAGES,
-        PROP_LC_PAPER,
-        PROP_LC_NAME,
-        PROP_LC_ADDRESS,
-        PROP_LC_TELEPHONE,
-        PROP_LC_MEASUREMENT,
-        PROP_LC_IDENTIFICATION,
-        _PROP_MAX
+        LOCALE_LANG,
+        LOCALE_LANGUAGE,
+        LOCALE_LC_CTYPE,
+        LOCALE_LC_NUMERIC,
+        LOCALE_LC_TIME,
+        LOCALE_LC_COLLATE,
+        LOCALE_LC_MONETARY,
+        LOCALE_LC_MESSAGES,
+        LOCALE_LC_PAPER,
+        LOCALE_LC_NAME,
+        LOCALE_LC_ADDRESS,
+        LOCALE_LC_TELEPHONE,
+        LOCALE_LC_MEASUREMENT,
+        LOCALE_LC_IDENTIFICATION,
+        _LOCALE_MAX
 };
 
-static const char * const names[_PROP_MAX] = {
-        [PROP_LANG] = "LANG",
-        [PROP_LANGUAGE] = "LANGUAGE",
-        [PROP_LC_CTYPE] = "LC_CTYPE",
-        [PROP_LC_NUMERIC] = "LC_NUMERIC",
-        [PROP_LC_TIME] = "LC_TIME",
-        [PROP_LC_COLLATE] = "LC_COLLATE",
-        [PROP_LC_MONETARY] = "LC_MONETARY",
-        [PROP_LC_MESSAGES] = "LC_MESSAGES",
-        [PROP_LC_PAPER] = "LC_PAPER",
-        [PROP_LC_NAME] = "LC_NAME",
-        [PROP_LC_ADDRESS] = "LC_ADDRESS",
-        [PROP_LC_TELEPHONE] = "LC_TELEPHONE",
-        [PROP_LC_MEASUREMENT] = "LC_MEASUREMENT",
-        [PROP_LC_IDENTIFICATION] = "LC_IDENTIFICATION"
+static const char * const names[_LOCALE_MAX] = {
+        [LOCALE_LANG] = "LANG",
+        [LOCALE_LANGUAGE] = "LANGUAGE",
+        [LOCALE_LC_CTYPE] = "LC_CTYPE",
+        [LOCALE_LC_NUMERIC] = "LC_NUMERIC",
+        [LOCALE_LC_TIME] = "LC_TIME",
+        [LOCALE_LC_COLLATE] = "LC_COLLATE",
+        [LOCALE_LC_MONETARY] = "LC_MONETARY",
+        [LOCALE_LC_MESSAGES] = "LC_MESSAGES",
+        [LOCALE_LC_PAPER] = "LC_PAPER",
+        [LOCALE_LC_NAME] = "LC_NAME",
+        [LOCALE_LC_ADDRESS] = "LC_ADDRESS",
+        [LOCALE_LC_TELEPHONE] = "LC_TELEPHONE",
+        [LOCALE_LC_MEASUREMENT] = "LC_MEASUREMENT",
+        [LOCALE_LC_IDENTIFICATION] = "LC_IDENTIFICATION"
 };
 
-static char *data[_PROP_MAX] = {};
+typedef struct Context {
+        char *locale[_LOCALE_MAX];
 
-typedef struct State {
-        char *x11_layout, *x11_model, *x11_variant, *x11_options;
-        char *vc_keymap, *vc_keymap_toggle;
-} State;
+        char *x11_layout;
+        char *x11_model;
+        char *x11_variant;
+        char *x11_options;
 
-static State state;
+        char *vc_keymap;
+        char *vc_keymap_toggle;
 
-static usec_t remain_until = 0;
+        Hashmap *polkit_registry;
+} Context;
 
-static int free_and_set(char **s, const char *v) {
+static int free_and_copy(char **s, const char *v) {
         int r;
         char *t;
 
@@ -145,106 +106,97 @@ static int free_and_set(char **s, const char *v) {
         return 0;
 }
 
-static void free_data_locale(void) {
-        int p;
-
-        for (p = 0; p < _PROP_MAX; p++) {
-                free(data[p]);
-                data[p] = NULL;
-        }
+static void free_and_replace(char **s, char *v) {
+        free(*s);
+        *s = v;
 }
 
-static void free_data_x11(void) {
-        free(state.x11_layout);
-        free(state.x11_model);
-        free(state.x11_variant);
-        free(state.x11_options);
+static void context_free_x11(Context *c) {
+        free_and_replace(&c->x11_layout, NULL);
+        free_and_replace(&c->x11_model, NULL);
+        free_and_replace(&c->x11_variant, NULL);
+        free_and_replace(&c->x11_options, NULL);
+}
 
-        state.x11_layout = state.x11_model = state.x11_variant = state.x11_options = NULL;
+static void context_free_vconsole(Context *c) {
+        free_and_replace(&c->vc_keymap, NULL);
+        free_and_replace(&c->vc_keymap_toggle, NULL);
 }
 
-static void free_data_vconsole(void) {
-        free(state.vc_keymap);
-        free(state.vc_keymap_toggle);
+static void context_free_locale(Context *c) {
+        int p;
 
-        state.vc_keymap = state.vc_keymap_toggle = NULL;
+        for (p = 0; p < _LOCALE_MAX; p++)
+                free_and_replace(&c->locale[p], NULL);
 }
 
-static void simplify(void) {
+static void context_free(Context *c, sd_bus *bus) {
+        context_free_locale(c);
+        context_free_x11(c);
+        context_free_vconsole(c);
+
+        bus_verify_polkit_async_registry_free(bus, c->polkit_registry);
+};
+
+static void locale_simplify(Context *c) {
         int p;
 
-        for (p = 1; p < _PROP_MAX; p++)
-                if (isempty(data[p]) || streq_ptr(data[PROP_LANG], data[p])) {
-                        free(data[p]);
-                        data[p] = NULL;
+        for (p = LOCALE_LANG+1; p < _LOCALE_MAX; p++)
+                if (isempty(c->locale[p]) || streq_ptr(c->locale[LOCALE_LANG], c->locale[p])) {
+                        free(c->locale[p]);
+                        c->locale[p] = NULL;
                 }
 }
 
-static int read_data_locale(void) {
+static int locale_read_data(Context *c) {
         int r;
 
-        free_data_locale();
+        context_free_locale(c);
 
         r = parse_env_file("/etc/locale.conf", NEWLINE,
-                           "LANG",              &data[PROP_LANG],
-                           "LANGUAGE",          &data[PROP_LANGUAGE],
-                           "LC_CTYPE",          &data[PROP_LC_CTYPE],
-                           "LC_NUMERIC",        &data[PROP_LC_NUMERIC],
-                           "LC_TIME",           &data[PROP_LC_TIME],
-                           "LC_COLLATE",        &data[PROP_LC_COLLATE],
-                           "LC_MONETARY",       &data[PROP_LC_MONETARY],
-                           "LC_MESSAGES",       &data[PROP_LC_MESSAGES],
-                           "LC_PAPER",          &data[PROP_LC_PAPER],
-                           "LC_NAME",           &data[PROP_LC_NAME],
-                           "LC_ADDRESS",        &data[PROP_LC_ADDRESS],
-                           "LC_TELEPHONE",      &data[PROP_LC_TELEPHONE],
-                           "LC_MEASUREMENT",    &data[PROP_LC_MEASUREMENT],
-                           "LC_IDENTIFICATION", &data[PROP_LC_IDENTIFICATION],
+                           "LANG",              &c->locale[LOCALE_LANG],
+                           "LANGUAGE",          &c->locale[LOCALE_LANGUAGE],
+                           "LC_CTYPE",          &c->locale[LOCALE_LC_CTYPE],
+                           "LC_NUMERIC",        &c->locale[LOCALE_LC_NUMERIC],
+                           "LC_TIME",           &c->locale[LOCALE_LC_TIME],
+                           "LC_COLLATE",        &c->locale[LOCALE_LC_COLLATE],
+                           "LC_MONETARY",       &c->locale[LOCALE_LC_MONETARY],
+                           "LC_MESSAGES",       &c->locale[LOCALE_LC_MESSAGES],
+                           "LC_PAPER",          &c->locale[LOCALE_LC_PAPER],
+                           "LC_NAME",           &c->locale[LOCALE_LC_NAME],
+                           "LC_ADDRESS",        &c->locale[LOCALE_LC_ADDRESS],
+                           "LC_TELEPHONE",      &c->locale[LOCALE_LC_TELEPHONE],
+                           "LC_MEASUREMENT",    &c->locale[LOCALE_LC_MEASUREMENT],
+                           "LC_IDENTIFICATION", &c->locale[LOCALE_LC_IDENTIFICATION],
                            NULL);
 
         if (r == -ENOENT) {
                 int p;
 
                 /* Fill in what we got passed from systemd. */
-
-                for (p = 0; p < _PROP_MAX; p++) {
-                        char *e, *d;
-
+                for (p = 0; p < _LOCALE_MAX; p++) {
                         assert(names[p]);
 
-                        e = getenv(names[p]);
-                        if (e) {
-                                d = strdup(e);
-                                if (!d)
-                                        return -ENOMEM;
-                        } else
-                                d = NULL;
-
-                        free(data[p]);
-                        data[p] = d;
+                        r = free_and_copy(&c->locale[p], getenv(names[p]));
+                        if (r < 0)
+                                return r;
                 }
 
                 r = 0;
         }
 
-        simplify();
+        locale_simplify(c);
         return r;
 }
 
-static void free_data(void) {
-        free_data_locale();
-        free_data_vconsole();
-        free_data_x11();
-}
-
-static int read_data_vconsole(void) {
+static int vconsole_read_data(Context *c) {
         int r;
 
-        free_data_vconsole();
+        context_free_vconsole(c);
 
         r = parse_env_file("/etc/vconsole.conf", NEWLINE,
-                           "KEYMAP",        &state.vc_keymap,
-                           "KEYMAP_TOGGLE", &state.vc_keymap_toggle,
+                           "KEYMAP",        &c->vc_keymap,
+                           "KEYMAP_TOGGLE", &c->vc_keymap_toggle,
                            NULL);
 
         if (r < 0 && r != -ENOENT)
@@ -253,12 +205,12 @@ static int read_data_vconsole(void) {
         return 0;
 }
 
-static int read_data_x11(void) {
+static int x11_read_data(Context *c) {
         FILE *f;
         char line[LINE_MAX];
         bool in_section = false;
 
-        free_data_x11();
+        context_free_x11(c);
 
         f = fopen("/etc/X11/xorg.conf.d/00-keyboard.conf", "re");
         if (!f)
@@ -283,22 +235,17 @@ static int read_data_x11(void) {
                         }
 
                         if (strv_length(a) == 3) {
-
                                 if (streq(a[1], "XkbLayout")) {
-                                        free(state.x11_layout);
-                                        state.x11_layout = a[2];
+                                        free_and_replace(&c->x11_layout, a[2]);
                                         a[2] = NULL;
                                 } else if (streq(a[1], "XkbModel")) {
-                                        free(state.x11_model);
-                                        state.x11_model = a[2];
+                                        free_and_replace(&c->x11_model, a[2]);
                                         a[2] = NULL;
                                 } else if (streq(a[1], "XkbVariant")) {
-                                        free(state.x11_variant);
-                                        state.x11_variant = a[2];
+                                        free_and_replace(&c->x11_variant, a[2]);
                                         a[2] = NULL;
                                 } else if (streq(a[1], "XkbOptions")) {
-                                        free(state.x11_options);
-                                        state.x11_options = a[2];
+                                        free_and_replace(&c->x11_options, a[2]);
                                         a[2] = NULL;
                                 }
                         }
@@ -327,17 +274,17 @@ static int read_data_x11(void) {
         return 0;
 }
 
-static int read_data(void) {
+static int context_read_data(Context *c) {
         int r, q, p;
 
-        r = read_data_locale();
-        q = read_data_vconsole();
-        p = read_data_x11();
+        r = locale_read_data(c);
+        q = vconsole_read_data(c);
+        p = x11_read_data(c);
 
         return r < 0 ? r : q < 0 ? q : p;
 }
 
-static int write_data_locale(void) {
+static int locale_write_data(Context *c) {
         int r, p;
         char **l = NULL;
 
@@ -345,17 +292,17 @@ static int write_data_locale(void) {
         if (r < 0 && r != -ENOENT)
                 return r;
 
-        for (p = 0; p < _PROP_MAX; p++) {
+        for (p = 0; p < _LOCALE_MAX; p++) {
                 char *t, **u;
 
                 assert(names[p]);
 
-                if (isempty(data[p])) {
+                if (isempty(c->locale[p])) {
                         l = strv_env_unset(l, names[p]);
                         continue;
                 }
 
-                if (asprintf(&t, "%s=%s", names[p], data[p]) < 0) {
+                if (asprintf(&t, "%s=%s", names[p], c->locale[p]) < 0) {
                         strv_free(l);
                         return -ENOMEM;
                 }
@@ -385,98 +332,64 @@ static int write_data_locale(void) {
         return r;
 }
 
-static void push_data(DBusConnection *bus) {
-        char **l_set = NULL, **l_unset = NULL, **t;
-        int c_set = 0, c_unset = 0, p;
-        DBusError error;
-        DBusMessage *m = NULL, *reply = NULL;
-        DBusMessageIter iter, sub;
-
-        dbus_error_init(&error);
+static int locale_update_system_manager(Context *c, sd_bus *bus) {
+        _cleanup_free_ char **l_unset = NULL;
+        _cleanup_strv_free_ char **l_set = NULL;
+        _cleanup_bus_message_unref_ sd_bus_message *m = NULL;
+        sd_bus_error error = SD_BUS_ERROR_NULL;
+        unsigned c_set, c_unset, p;
+        int r;
 
         assert(bus);
 
-        l_set = new0(char*, _PROP_MAX);
-        l_unset = new0(char*, _PROP_MAX);
-        if (!l_set || !l_unset) {
-                log_oom();
-                goto finish;
-        }
+        l_unset = new0(char*, _LOCALE_MAX);
+        if (!l_unset)
+                return -ENOMEM;
 
-        for (p = 0; p < _PROP_MAX; p++) {
+        l_set = new0(char*, _LOCALE_MAX);
+        if (!l_set)
+                return -ENOMEM;
+
+        for (p = 0, c_set = 0, c_unset = 0; p < _LOCALE_MAX; p++) {
                 assert(names[p]);
 
-                if (isempty(data[p]))
+                if (isempty(c->locale[p]))
                         l_unset[c_set++] = (char*) names[p];
                 else {
                         char *s;
 
-                        if (asprintf(&s, "%s=%s", names[p], data[p]) < 0) {
-                                log_oom();
-                                goto finish;
-                        }
+                        if (asprintf(&s, "%s=%s", names[p], c->locale[p]) < 0)
+                                return -ENOMEM;
 
                         l_set[c_unset++] = s;
                 }
         }
 
-        assert(c_set + c_unset == _PROP_MAX);
-        m = dbus_message_new_method_call("org.freedesktop.systemd1", "/org/freedesktop/systemd1", "org.freedesktop.systemd1.Manager", "UnsetAndSetEnvironment");
-        if (!m) {
-                log_error("Could not allocate message.");
-                goto finish;
-        }
-
-        dbus_message_iter_init_append(m, &iter);
-
-        if (!dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, "s", &sub)) {
-                log_oom();
-                goto finish;
-        }
-
-        STRV_FOREACH(t, l_unset)
-                if (!dbus_message_iter_append_basic(&sub, DBUS_TYPE_STRING, t)) {
-                        log_oom();
-                        goto finish;
-                }
-
-        if (!dbus_message_iter_close_container(&iter, &sub) ||
-            !dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, "s", &sub)) {
-                log_oom();
-                goto finish;
-        }
-
-        STRV_FOREACH(t, l_set)
-                if (!dbus_message_iter_append_basic(&sub, DBUS_TYPE_STRING, t)) {
-                        log_oom();
-                        goto finish;
-                }
-
-        if (!dbus_message_iter_close_container(&iter, &sub)) {
-                log_oom();
-                goto finish;
-        }
-
-        reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error);
-        if (!reply) {
-                log_error("Failed to set locale information: %s", bus_error_message(&error));
-                goto finish;
-        }
+        assert(c_set + c_unset == _LOCALE_MAX);
+        r = sd_bus_message_new_method_call(bus,
+                        "org.freedesktop.systemd1",
+                        "/org/freedesktop/systemd1",
+                        "org.freedesktop.systemd1.Manager",
+                        "UnsetAndSetEnvironment", &m);
+        if (r < 0)
+                return r;
 
-finish:
-        if (m)
-                dbus_message_unref(m);
+        r = sd_bus_message_append_strv(m, l_unset);
+        if (r < 0)
+                return r;
 
-        if (reply)
-                dbus_message_unref(reply);
+        r = sd_bus_message_append_strv(m, l_set);
+        if (r < 0)
+                return r;
 
-        dbus_error_free(&error);
+        r = sd_bus_send_with_reply_and_block(bus, m, 0, &error, NULL);
+        if (r < 0)
+                log_error("Failed to update the manager environment: %s", strerror(-r));
 
-        strv_free(l_set);
-        free(l_unset);
+        return 0;
 }
 
-static int write_data_vconsole(void) {
+static int vconsole_write_data(Context *c) {
         int r;
         char **l = NULL;
 
@@ -484,12 +397,12 @@ static int write_data_vconsole(void) {
         if (r < 0 && r != -ENOENT)
                 return r;
 
-        if (isempty(state.vc_keymap))
+        if (isempty(c->vc_keymap))
                 l = strv_env_unset(l, "KEYMAP");
         else {
                 char *s, **u;
 
-                s = strappend("KEYMAP=", state.vc_keymap);
+                s = strappend("KEYMAP=", c->vc_keymap);
                 if (!s) {
                         strv_free(l);
                         return -ENOMEM;
@@ -505,12 +418,12 @@ static int write_data_vconsole(void) {
                 l = u;
         }
 
-        if (isempty(state.vc_keymap_toggle))
+        if (isempty(c->vc_keymap_toggle))
                 l = strv_env_unset(l, "KEYMAP_TOGGLE");
         else  {
                 char *s, **u;
 
-                s = strappend("KEYMAP_TOGGLE=", state.vc_keymap_toggle);
+                s = strappend("KEYMAP_TOGGLE=", c->vc_keymap_toggle);
                 if (!s) {
                         strv_free(l);
                         return -ENOMEM;
@@ -541,15 +454,15 @@ static int write_data_vconsole(void) {
         return r;
 }
 
-static int write_data_x11(void) {
+static int write_data_x11(Context *c) {
         FILE *f;
         char *temp_path;
         int r;
 
-        if (isempty(state.x11_layout) &&
-            isempty(state.x11_model) &&
-            isempty(state.x11_variant) &&
-            isempty(state.x11_options)) {
+        if (isempty(c->x11_layout) &&
+            isempty(c->x11_model) &&
+            isempty(c->x11_variant) &&
+            isempty(c->x11_options)) {
 
                 if (unlink("/etc/X11/xorg.conf.d/00-keyboard.conf") < 0)
                         return errno == ENOENT ? 0 : -errno;
@@ -571,17 +484,17 @@ static int write_data_x11(void) {
               "        Identifier \"system-keyboard\"\n"
               "        MatchIsKeyboard \"on\"\n", f);
 
-        if (!isempty(state.x11_layout))
-                fprintf(f, "        Option \"XkbLayout\" \"%s\"\n", state.x11_layout);
+        if (!isempty(c->x11_layout))
+                fprintf(f, "        Option \"XkbLayout\" \"%s\"\n", c->x11_layout);
 
-        if (!isempty(state.x11_model))
-                fprintf(f, "        Option \"XkbModel\" \"%s\"\n", state.x11_model);
+        if (!isempty(c->x11_model))
+                fprintf(f, "        Option \"XkbModel\" \"%s\"\n", c->x11_model);
 
-        if (!isempty(state.x11_variant))
-                fprintf(f, "        Option \"XkbVariant\" \"%s\"\n", state.x11_variant);
+        if (!isempty(c->x11_variant))
+                fprintf(f, "        Option \"XkbVariant\" \"%s\"\n", c->x11_variant);
 
-        if (!isempty(state.x11_options))
-                fprintf(f, "        Option \"XkbOptions\" \"%s\"\n", state.x11_options);
+        if (!isempty(c->x11_options))
+                fprintf(f, "        Option \"XkbOptions\" \"%s\"\n", c->x11_options);
 
         fputs("EndSection\n", f);
         fflush(f);
@@ -599,58 +512,23 @@ static int write_data_x11(void) {
         return r;
 }
 
-static int load_vconsole_keymap(DBusConnection *bus, DBusError *error) {
-        DBusMessage *m = NULL, *reply = NULL;
-        const char *name = "systemd-vconsole-setup.service", *mode = "replace";
+static int vconsole_reload(sd_bus *bus) {
+        _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
         int r;
-        DBusError _error;
 
         assert(bus);
 
-        if (!error) {
-                dbus_error_init(&_error);
-                error = &_error;
-        }
-
-        m = dbus_message_new_method_call(
+        r = sd_bus_call_method(bus,
                         "org.freedesktop.systemd1",
                         "/org/freedesktop/systemd1",
                         "org.freedesktop.systemd1.Manager",
-                        "RestartUnit");
-        if (!m) {
-                log_error("Could not allocate message.");
-                r = -ENOMEM;
-                goto finish;
-        }
-
-        if (!dbus_message_append_args(m,
-                                      DBUS_TYPE_STRING, &name,
-                                      DBUS_TYPE_STRING, &mode,
-                                      DBUS_TYPE_INVALID)) {
-                log_error("Could not append arguments to message.");
-                r = -ENOMEM;
-                goto finish;
-        }
-
-        reply = dbus_connection_send_with_reply_and_block(bus, m, -1, error);
-        if (!reply) {
-                log_error("Failed to issue method call: %s", bus_error_message(error));
-                r = -EIO;
-                goto finish;
-        }
-
-        r = 0;
-
-finish:
-        if (m)
-                dbus_message_unref(m);
-
-        if (reply)
-                dbus_message_unref(reply);
-
-        if (error == &_error)
-                dbus_error_free(error);
+                        "RestartUnit",
+                        &error,
+                        NULL,
+                        "ss", "systemd-vconsole-setup.service", "replace");
 
+        if (r < 0)
+                log_error("Failed to issue method call: %s", bus_error_message(&error, -r));
         return r;
 }
 
@@ -698,20 +576,20 @@ static int read_next_mapping(FILE *f, unsigned *n, char ***a) {
         }
 }
 
-static int convert_vconsole_to_x11(DBusConnection *connection) {
+static int vconsole_convert_to_x11(Context *c, sd_bus *bus) {
         bool modified = false;
 
-        assert(connection);
+        assert(bus);
 
-        if (isempty(state.vc_keymap)) {
+        if (isempty(c->vc_keymap)) {
 
                 modified =
-                        !isempty(state.x11_layout) ||
-                        !isempty(state.x11_model) ||
-                        !isempty(state.x11_variant) ||
-                        !isempty(state.x11_options);
+                        !isempty(c->x11_layout) ||
+                        !isempty(c->x11_model) ||
+                        !isempty(c->x11_variant) ||
+                        !isempty(c->x11_options);
 
-                free_data_x11();
+                context_free_x11(c);
         } else {
                 FILE *f;
                 unsigned n = 0;
@@ -733,20 +611,20 @@ static int convert_vconsole_to_x11(DBusConnection *connection) {
                         if (r == 0)
                                 break;
 
-                        if (!streq(state.vc_keymap, a[0])) {
+                        if (!streq(c->vc_keymap, a[0])) {
                                 strv_free(a);
                                 continue;
                         }
 
-                        if (!streq_ptr(state.x11_layout, strnulldash(a[1])) ||
-                            !streq_ptr(state.x11_model, strnulldash(a[2])) ||
-                            !streq_ptr(state.x11_variant, strnulldash(a[3])) ||
-                            !streq_ptr(state.x11_options, strnulldash(a[4]))) {
+                        if (!streq_ptr(c->x11_layout, strnulldash(a[1])) ||
+                            !streq_ptr(c->x11_model, strnulldash(a[2])) ||
+                            !streq_ptr(c->x11_variant, strnulldash(a[3])) ||
+                            !streq_ptr(c->x11_options, strnulldash(a[4]))) {
 
-                                if (free_and_set(&state.x11_layout, strnulldash(a[1])) < 0 ||
-                                    free_and_set(&state.x11_model, strnulldash(a[2])) < 0 ||
-                                    free_and_set(&state.x11_variant, strnulldash(a[3])) < 0 ||
-                                    free_and_set(&state.x11_options, strnulldash(a[4])) < 0) {
+                                if (free_and_copy(&c->x11_layout, strnulldash(a[1])) < 0 ||
+                                    free_and_copy(&c->x11_model, strnulldash(a[2])) < 0 ||
+                                    free_and_copy(&c->x11_variant, strnulldash(a[3])) < 0 ||
+                                    free_and_copy(&c->x11_options, strnulldash(a[4])) < 0) {
                                         strv_free(a);
                                         fclose(f);
                                         return -ENOMEM;
@@ -763,47 +641,33 @@ static int convert_vconsole_to_x11(DBusConnection *connection) {
         }
 
         if (modified) {
-                dbus_bool_t b;
-                DBusMessage *changed;
                 int r;
 
-                r = write_data_x11();
+                r = write_data_x11(c);
                 if (r < 0)
                         log_error("Failed to set X11 keyboard layout: %s", strerror(-r));
 
-                changed = bus_properties_changed_new(
+                sd_bus_emit_properties_changed(bus,
                                 "/org/freedesktop/locale1",
                                 "org.freedesktop.locale1",
-                                "X11Layout\0"
-                                "X11Model\0"
-                                "X11Variant\0"
-                                "X11Options\0");
-
-                if (!changed)
-                        return -ENOMEM;
-
-                b = dbus_connection_send(connection, changed, NULL);
-                dbus_message_unref(changed);
-
-                if (!b)
-                        return -ENOMEM;
+                                "X11Layout", "X11Model", "X11Variant", "X11Options", NULL);
         }
 
         return 0;
 }
 
-static int convert_x11_to_vconsole(DBusConnection *connection) {
+static int x11_convert_to_vconsole(Context *c, sd_bus *bus) {
         bool modified = false;
 
-        assert(connection);
+        assert(bus);
 
-        if (isempty(state.x11_layout)) {
+        if (isempty(c->x11_layout)) {
 
                 modified =
-                        !isempty(state.vc_keymap) ||
-                        !isempty(state.vc_keymap_toggle);
+                        !isempty(c->vc_keymap) ||
+                        !isempty(c->vc_keymap_toggle);
 
-                free_data_x11();
+                context_free_x11(c);
         } else {
                 _cleanup_fclose_ FILE *f;
                 unsigned n = 0;
@@ -826,13 +690,13 @@ static int convert_x11_to_vconsole(DBusConnection *connection) {
                                 break;
 
                         /* Determine how well matching this entry is */
-                        if (streq_ptr(state.x11_layout, a[1]))
+                        if (streq_ptr(c->x11_layout, a[1]))
                                 /* If we got an exact match, this is best */
                                 matching = 10;
                         else {
                                 size_t x;
 
-                                x = strcspn(state.x11_layout, ",");
+                                x = strcspn(c->x11_layout, ",");
 
                                 /* We have multiple X layouts, look
                                  * for an entry that matches our key
@@ -840,7 +704,7 @@ static int convert_x11_to_vconsole(DBusConnection *connection) {
                                  * layout stripped off. */
                                 if (x > 0 &&
                                     strlen(a[1]) == x &&
-                                    strneq(state.x11_layout, a[1], x))
+                                    strneq(c->x11_layout, a[1], x))
                                         matching = 5;
                                 else  {
                                         size_t w;
@@ -848,23 +712,22 @@ static int convert_x11_to_vconsole(DBusConnection *connection) {
                                         /* If that didn't work, strip
                                          * off the other layouts from
                                          * the entry, too */
-
                                         w = strcspn(a[1], ",");
 
                                         if (x > 0 && x == w &&
-                                            memcmp(state.x11_layout, a[1], x) == 0)
+                                            memcmp(c->x11_layout, a[1], x) == 0)
                                                 matching = 1;
                                 }
                         }
 
                         if (matching > 0 &&
-                            streq_ptr(state.x11_model, a[2])) {
+                            streq_ptr(c->x11_model, a[2])) {
                                 matching++;
 
-                                if (streq_ptr(state.x11_variant, a[3])) {
+                                if (streq_ptr(c->x11_variant, a[3])) {
                                         matching++;
 
-                                        if (streq_ptr(state.x11_options, a[4]))
+                                        if (streq_ptr(c->x11_options, a[4]))
                                                 matching++;
                                 }
                         }
@@ -881,460 +744,370 @@ static int convert_x11_to_vconsole(DBusConnection *connection) {
                         }
                 }
 
-                if (!streq_ptr(state.vc_keymap, new_keymap)) {
-                        free(state.vc_keymap);
-                        state.vc_keymap = new_keymap;
-
-                        free(state.vc_keymap_toggle);
-                        state.vc_keymap_toggle = NULL;
-
+                if (!streq_ptr(c->vc_keymap, new_keymap)) {
+                        free_and_replace(&c->vc_keymap, new_keymap);
+                        free_and_replace(&c->vc_keymap_toggle, NULL);
                         modified = true;
                 } else
                         free(new_keymap);
         }
 
         if (modified) {
-                dbus_bool_t b;
-
-                _cleanup_dbus_message_unref_ DBusMessage *changed = NULL;
                 int r;
 
-                r = write_data_vconsole();
+                r = vconsole_write_data(c);
                 if (r < 0)
                         log_error("Failed to set virtual console keymap: %s", strerror(-r));
 
-                changed = bus_properties_changed_new(
+                sd_bus_emit_properties_changed(bus,
                                 "/org/freedesktop/locale1",
                                 "org.freedesktop.locale1",
-                                "VConsoleKeymap\0"
-                                "VConsoleKeymapToggle\0");
-                if (!changed)
-                        return -ENOMEM;
+                                "VConsoleKeymap", "VConsoleKeymapToggle", NULL);
 
-                b = dbus_connection_send(connection, changed, NULL);
-                if (!b)
-                        return -ENOMEM;
-
-                return load_vconsole_keymap(connection, NULL);
+                return vconsole_reload(bus);
         }
 
         return 0;
 }
 
-static int append_locale(DBusMessageIter *i, const char *property, void *userdata) {
-        int c, p;
+static int property_get_locale(sd_bus *bus, const char *path, const char *interface,
+                               const char *property, sd_bus_message *reply, sd_bus_error *error, void *userdata) {
+        Context *c = userdata;
         _cleanup_strv_free_ char **l = NULL;
+        int p, q;
 
-        l = new0(char*, _PROP_MAX+1);
+        l = new0(char*, _LOCALE_MAX+1);
         if (!l)
                 return -ENOMEM;
 
-        for (p = 0, c = 0; p < _PROP_MAX; p++) {
+        for (p = 0, q = 0; p < _LOCALE_MAX; p++) {
                 char *t;
 
-                if (isempty(data[p]))
+                if (isempty(c->locale[p]))
                         continue;
 
-                if (asprintf(&t, "%s=%s", names[p], data[p]) < 0)
+                if (asprintf(&t, "%s=%s", names[p], c->locale[p]) < 0)
                         return -ENOMEM;
 
-                l[c++] = t;
+                l[q++] = t;
         }
 
-        return bus_property_append_strv(i, property, (void*) l);
+        return sd_bus_message_append_strv(reply, l);
 }
 
-static const BusProperty bus_locale_properties[] = {
-        { "Locale",               append_locale,             "as", 0 },
-        { "X11Layout",            bus_property_append_string, "s", offsetof(State, x11_layout),       true },
-        { "X11Model",             bus_property_append_string, "s", offsetof(State, x11_model),        true },
-        { "X11Variant",           bus_property_append_string, "s", offsetof(State, x11_variant),      true },
-        { "X11Options",           bus_property_append_string, "s", offsetof(State, x11_options),      true },
-        { "VConsoleKeymap",       bus_property_append_string, "s", offsetof(State, vc_keymap),        true },
-        { "VConsoleKeymapToggle", bus_property_append_string, "s", offsetof(State, vc_keymap_toggle), true },
-        { NULL, }
-};
-
-static const BusBoundProperties bps[] = {
-        { "org.freedesktop.locale1", bus_locale_properties, &state },
-        { NULL, }
-};
-
-static DBusHandlerResult locale_message_handler(
-                DBusConnection *connection,
-                DBusMessage *message,
-                void *userdata) {
-
-        DBusMessage *reply = NULL, *changed = NULL;
-        DBusError error;
+static int method_set_locale(sd_bus *bus, sd_bus_message *m, void *userdata) {
+        Context *c = userdata;
+        _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
+        _cleanup_strv_free_ char **l = NULL;
+        char **i;
+        int interactive;
+        bool modified = false;
+        bool passed[_LOCALE_MAX] = {};
+        int p;
         int r;
 
-        assert(connection);
-        assert(message);
+        r = bus_message_read_strv_extend(m, &l);
+        if (r < 0)
+                return sd_bus_reply_method_errno(bus, m, r, NULL);
 
-        dbus_error_init(&error);
+        r = sd_bus_message_read_basic(m, 'b', &interactive);
+        if (r < 0)
+                return sd_bus_reply_method_errno(bus, m, r, NULL);
 
-        if (dbus_message_is_method_call(message, "org.freedesktop.locale1", "SetLocale")) {
-                char **l = NULL, **i;
-                dbus_bool_t interactive;
-                DBusMessageIter iter;
-                bool modified = false;
-                bool passed[_PROP_MAX] = {};
-                int p;
+        /* Check whether a variable changed and if so valid */
+        STRV_FOREACH(i, l) {
+                bool valid = false;
 
-                if (!dbus_message_iter_init(message, &iter))
-                        return bus_send_error_reply(connection, message, NULL, -EINVAL);
+                for (p = 0; p < _LOCALE_MAX; p++) {
+                        size_t k;
 
-                r = bus_parse_strv_iter(&iter, &l);
-                if (r < 0) {
-                        if (r == -ENOMEM)
-                                goto oom;
+                        k = strlen(names[p]);
+                        if (startswith(*i, names[p]) &&
+                            (*i)[k] == '=' &&
+                            string_is_safe((*i) + k + 1)) {
+                                valid = true;
+                                passed[p] = true;
 
-                        return bus_send_error_reply(connection, message, NULL, r);
-                }
+                                if (!streq_ptr(*i + k + 1, c->locale[p]))
+                                        modified = true;
 
-                if (!dbus_message_iter_next(&iter) ||
-                    dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_BOOLEAN)  {
-                        strv_free(l);
-                        return bus_send_error_reply(connection, message, NULL, -EINVAL);
+                                break;
+                        }
                 }
 
-                dbus_message_iter_get_basic(&iter, &interactive);
+                if (!valid)
+                        sd_bus_reply_method_errorf(bus, m, SD_BUS_ERROR_INVALID_ARGS, "Invalid Locale data.");
+        }
 
-                /* Check whether a variable changed and if so valid */
-                STRV_FOREACH(i, l) {
-                        bool valid = false;
+        /* Check whether a variable is unset */
+        if (!modified)  {
+                for (p = 0; p < _LOCALE_MAX; p++)
+                        if (!isempty(c->locale[p]) && !passed[p]) {
+                                modified = true;
+                                break;
+                        }
+        }
+
+        if (modified) {
+                r = bus_verify_polkit_async(bus, &c->polkit_registry, m,
+                                            "org.freedesktop.locale1.set-locale", interactive,
+                                            &error, method_set_locale, c);
+                if (r < 0)
+                        return sd_bus_reply_method_errno(bus, m, r, &error);
+                if (r == 0)
+                        return 1; /* No authorization for now, but the async polkit stuff will call us again when it has it */
 
-                        for (p = 0; p < _PROP_MAX; p++) {
+                STRV_FOREACH(i, l) {
+                        for (p = 0; p < _LOCALE_MAX; p++) {
                                 size_t k;
 
                                 k = strlen(names[p]);
-                                if (startswith(*i, names[p]) &&
-                                    (*i)[k] == '=' &&
-                                    string_is_safe((*i) + k + 1)) {
-                                        valid = true;
-                                        passed[p] = true;
+                                if (startswith(*i, names[p]) && (*i)[k] == '=') {
+                                        char *t;
 
-                                        if (!streq_ptr(*i + k + 1, data[p]))
-                                                modified = true;
+                                        t = strdup(*i + k + 1);
+                                        if (!t)
+                                                return -ENOMEM;
 
+                                        free(c->locale[p]);
+                                        c->locale[p] = t;
                                         break;
                                 }
                         }
-
-                        if (!valid) {
-                                strv_free(l);
-                                return bus_send_error_reply(connection, message, NULL, -EINVAL);
-                        }
                 }
 
-                /* Check whether a variable is unset */
-                if (!modified)  {
-                        for (p = 0; p < _PROP_MAX; p++)
-                                if (!isempty(data[p]) && !passed[p]) {
-                                        modified = true;
-                                        break;
-                                }
-                }
-
-                if (modified) {
-
-                        r = verify_polkit(connection, message, "org.freedesktop.locale1.set-locale", interactive, NULL, &error);
-                        if (r < 0) {
-                                strv_free(l);
-                                return bus_send_error_reply(connection, message, &error, r);
-                        }
-
-                        STRV_FOREACH(i, l) {
-                                for (p = 0; p < _PROP_MAX; p++) {
-                                        size_t k;
-
-                                        k = strlen(names[p]);
-                                        if (startswith(*i, names[p]) && (*i)[k] == '=') {
-                                                char *t;
-
-                                                t = strdup(*i + k + 1);
-                                                if (!t) {
-                                                        strv_free(l);
-                                                        goto oom;
-                                                }
-
-                                                free(data[p]);
-                                                data[p] = t;
-
-                                                break;
-                                        }
-                                }
-                        }
+                for (p = 0; p < _LOCALE_MAX; p++) {
+                        if (passed[p])
+                                continue;
 
-                        strv_free(l);
+                        free_and_replace(&c->locale[p], NULL);
+                }
 
-                        for (p = 0; p < _PROP_MAX; p++) {
-                                if (passed[p])
-                                        continue;
+                locale_simplify(c);
 
-                                free(data[p]);
-                                data[p] = NULL;
-                        }
+                r = locale_write_data(c);
+                if (r < 0) {
+                        log_error("Failed to set locale: %s", strerror(-r));
+                        return sd_bus_reply_method_errnof(bus, m, r, "Failed to set locale: %s", strerror(-r));
+                }
 
-                        simplify();
+                locale_update_system_manager(c, bus);
 
-                        r = write_data_locale();
-                        if (r < 0) {
-                                log_error("Failed to set locale: %s", strerror(-r));
-                                return bus_send_error_reply(connection, message, NULL, r);
-                        }
+                log_info("Changed locale information.");
 
-                        push_data(connection);
+                sd_bus_emit_properties_changed(bus,
+                                "/org/freedesktop/locale1",
+                                "org.freedesktop.locale1",
+                                "Locale", NULL);
+        }
 
-                        log_info("Changed locale information.");
+        return sd_bus_reply_method_return(bus, m, NULL);
+}
 
-                        changed = bus_properties_changed_new(
-                                        "/org/freedesktop/locale1",
-                                        "org.freedesktop.locale1",
-                                        "Locale\0");
-                        if (!changed)
-                                goto oom;
-                } else
-                        strv_free(l);
+static int method_set_vc_keyboard(sd_bus *bus, sd_bus_message *m, void *userdata) {
+        Context *c = userdata;
+        _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
+        const char *keymap, *keymap_toggle;
+        unsigned convert, interactive;
+        int r;
 
-        } else if (dbus_message_is_method_call(message, "org.freedesktop.locale1", "SetVConsoleKeyboard")) {
+        r = sd_bus_message_read(m, "ssbb", &keymap, &keymap_toggle, &convert, &interactive);
+        if (r < 0)
+                return sd_bus_reply_method_errno(bus, m, r, NULL);
 
-                const char *keymap, *keymap_toggle;
-                dbus_bool_t convert, interactive;
+        if (isempty(keymap))
+                keymap = NULL;
 
-                if (!dbus_message_get_args(
-                                    message,
-                                    &error,
-                                    DBUS_TYPE_STRING, &keymap,
-                                    DBUS_TYPE_STRING, &keymap_toggle,
-                                    DBUS_TYPE_BOOLEAN, &convert,
-                                    DBUS_TYPE_BOOLEAN, &interactive,
-                                    DBUS_TYPE_INVALID))
-                        return bus_send_error_reply(connection, message, &error, -EINVAL);
+        if (isempty(keymap_toggle))
+                keymap_toggle = NULL;
 
-                if (isempty(keymap))
-                        keymap = NULL;
+        if (!streq_ptr(keymap, c->vc_keymap) ||
+            !streq_ptr(keymap_toggle, c->vc_keymap_toggle)) {
 
-                if (isempty(keymap_toggle))
-                        keymap_toggle = NULL;
+                if ((keymap && (!filename_is_safe(keymap) || !string_is_safe(keymap))) ||
+                    (keymap_toggle && (!filename_is_safe(keymap_toggle) || !string_is_safe(keymap_toggle))))
+                        return sd_bus_reply_method_errnof(bus, m, r, "Received invalid keymap data: %s", -EINVAL);
 
-                if (!streq_ptr(keymap, state.vc_keymap) ||
-                    !streq_ptr(keymap_toggle, state.vc_keymap_toggle)) {
+                r = bus_verify_polkit_async(bus, &c->polkit_registry, m,
+                                "org.freedesktop.locale1.set-keyboard",
+                                interactive, &error, method_set_vc_keyboard, c);
+                if (r < 0)
+                        return sd_bus_reply_method_errno(bus, m, r, &error);
+                if (r == 0)
+                        return 1; /* No authorization for now, but the async polkit stuff will call us again when it has it */
 
-                        if ((keymap && (!filename_is_safe(keymap) || !string_is_safe(keymap))) ||
-                            (keymap_toggle && (!filename_is_safe(keymap_toggle) || !string_is_safe(keymap_toggle))))
-                                return bus_send_error_reply(connection, message, NULL, -EINVAL);
+                if (free_and_copy(&c->vc_keymap, keymap) < 0 ||
+                    free_and_copy(&c->vc_keymap_toggle, keymap_toggle) < 0)
+                        return -ENOMEM;
 
-                        r = verify_polkit(connection, message, "org.freedesktop.locale1.set-keyboard", interactive, NULL, &error);
-                        if (r < 0)
-                                return bus_send_error_reply(connection, message, &error, r);
+                r = vconsole_write_data(c);
+                if (r < 0) {
+                        log_error("Failed to set virtual console keymap: %s", strerror(-r));
+                        return sd_bus_reply_method_errnof(bus, m, r, "Failed to set virtual console keymap: %s", strerror(-r));
+                }
 
-                        if (free_and_set(&state.vc_keymap, keymap) < 0 ||
-                            free_and_set(&state.vc_keymap_toggle, keymap_toggle) < 0)
-                                goto oom;
+                log_info("Changed virtual console keymap to '%s'", strempty(c->vc_keymap));
 
-                        r = write_data_vconsole();
-                        if (r < 0) {
-                                log_error("Failed to set virtual console keymap: %s", strerror(-r));
-                                return bus_send_error_reply(connection, message, NULL, r);
-                        }
+                r = vconsole_reload(bus);
+                if (r < 0)
+                        log_error("Failed to request keymap reload: %s", strerror(-r));
 
-                        log_info("Changed virtual console keymap to '%s'", strempty(state.vc_keymap));
+                sd_bus_emit_properties_changed(bus,
+                                "/org/freedesktop/locale1",
+                                "org.freedesktop.locale1",
+                                "VConsoleKeymap", "VConsoleKeymapToggle", NULL);
 
-                        r = load_vconsole_keymap(connection, NULL);
+                if (convert) {
+                        r = vconsole_convert_to_x11(c, bus);
                         if (r < 0)
-                                log_error("Failed to request keymap reload: %s", strerror(-r));
-
-                        changed = bus_properties_changed_new(
-                                        "/org/freedesktop/locale1",
-                                        "org.freedesktop.locale1",
-                                        "VConsoleKeymap\0"
-                                        "VConsoleKeymapToggle\0");
-                        if (!changed)
-                                goto oom;
-
-                        if (convert) {
-                                r = convert_vconsole_to_x11(connection);
-
-                                if (r < 0)
-                                        log_error("Failed to convert keymap data: %s", strerror(-r));
-                        }
+                                log_error("Failed to convert keymap data: %s", strerror(-r));
                 }
+        }
 
-        } else if (dbus_message_is_method_call(message, "org.freedesktop.locale1", "SetX11Keyboard")) {
-
-                const char *layout, *model, *variant, *options;
-                dbus_bool_t convert, interactive;
-
-                if (!dbus_message_get_args(
-                                    message,
-                                    &error,
-                                    DBUS_TYPE_STRING, &layout,
-                                    DBUS_TYPE_STRING, &model,
-                                    DBUS_TYPE_STRING, &variant,
-                                    DBUS_TYPE_STRING, &options,
-                                    DBUS_TYPE_BOOLEAN, &convert,
-                                    DBUS_TYPE_BOOLEAN, &interactive,
-                                    DBUS_TYPE_INVALID))
-                        return bus_send_error_reply(connection, message, &error, -EINVAL);
-
-                if (isempty(layout))
-                        layout = NULL;
-
-                if (isempty(model))
-                        model = NULL;
-
-                if (isempty(variant))
-                        variant = NULL;
+        return sd_bus_reply_method_return(bus, m, NULL);
+}
 
-                if (isempty(options))
-                        options = NULL;
+static int method_set_x11_keyboard(sd_bus *bus, sd_bus_message *m, void *userdata) {
+        Context *c = userdata;
+        _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
+        const char *layout, *model, *variant, *options;
+        unsigned convert, interactive;
+        int r;
 
-                if (!streq_ptr(layout, state.x11_layout) ||
-                    !streq_ptr(model, state.x11_model) ||
-                    !streq_ptr(variant, state.x11_variant) ||
-                    !streq_ptr(options, state.x11_options)) {
+        r = sd_bus_message_read(m, "ssssbb", &layout, &model, &variant, &options, &convert, &interactive);
+        if (r < 0)
+                return sd_bus_reply_method_errno(bus, m, r, NULL);
 
-                        if ((layout && !string_is_safe(layout)) ||
-                            (model && !string_is_safe(model)) ||
-                            (variant && !string_is_safe(variant)) ||
-                            (options && !string_is_safe(options)))
-                                return bus_send_error_reply(connection, message, NULL, -EINVAL);
+        if (isempty(layout))
+                layout = NULL;
 
-                        r = verify_polkit(connection, message, "org.freedesktop.locale1.set-keyboard", interactive, NULL, &error);
-                        if (r < 0)
-                                return bus_send_error_reply(connection, message, &error, r);
+        if (isempty(model))
+                model = NULL;
 
-                        if (free_and_set(&state.x11_layout, layout) < 0 ||
-                            free_and_set(&state.x11_model, model) < 0 ||
-                            free_and_set(&state.x11_variant, variant) < 0 ||
-                            free_and_set(&state.x11_options, options) < 0)
-                                goto oom;
+        if (isempty(variant))
+                variant = NULL;
 
-                        r = write_data_x11();
-                        if (r < 0) {
-                                log_error("Failed to set X11 keyboard layout: %s", strerror(-r));
-                                return bus_send_error_reply(connection, message, NULL, r);
-                        }
+        if (isempty(options))
+                options = NULL;
 
-                        log_info("Changed X11 keyboard layout to '%s'", strempty(state.x11_layout));
+        if (!streq_ptr(layout, c->x11_layout) ||
+            !streq_ptr(model, c->x11_model) ||
+            !streq_ptr(variant, c->x11_variant) ||
+            !streq_ptr(options, c->x11_options)) {
 
-                        changed = bus_properties_changed_new(
-                                        "/org/freedesktop/locale1",
-                                        "org.freedesktop.locale1",
-                                        "X11Layout\0"
-                                        "X11Model\0"
-                                        "X11Variant\0"
-                                        "X11Options\0");
-                        if (!changed)
-                                goto oom;
+                if ((layout && !string_is_safe(layout)) ||
+                    (model && !string_is_safe(model)) ||
+                    (variant && !string_is_safe(variant)) ||
+                    (options && !string_is_safe(options)))
+                        return sd_bus_reply_method_errnof(bus, m, r, "Received invalid keyboard data: %s", -EINVAL);
 
-                        if (convert) {
-                                r = convert_x11_to_vconsole(connection);
+                r = bus_verify_polkit_async(bus, &c->polkit_registry, m,
+                                "org.freedesktop.locale1.set-keyboard",
+                                interactive, &error, method_set_x11_keyboard, c);
+                if (r < 0)
+                        return sd_bus_reply_method_errno(bus, m, r, &error);
+                if (r == 0)
+                        return 1; /* No authorization for now, but the async polkit stuff will call us again when it has it */
+
+                if (free_and_copy(&c->x11_layout, layout) < 0 ||
+                    free_and_copy(&c->x11_model, model) < 0 ||
+                    free_and_copy(&c->x11_variant, variant) < 0 ||
+                    free_and_copy(&c->x11_options, options) < 0)
+                        return -ENOMEM;
 
-                                if (r < 0)
-                                        log_error("Failed to convert keymap data: %s", strerror(-r));
-                        }
+                r = write_data_x11(c);
+                if (r < 0) {
+                        log_error("Failed to set X11 keyboard layout: %s", strerror(-r));
+                        return sd_bus_reply_method_errnof(bus, m, r, "Failed to set X11 keyboard layout: %s", strerror(-r));
                 }
-        } else
-                return bus_default_message_handler(connection, message, INTROSPECTION, INTERFACES_LIST, bps);
-
-        if (!(reply = dbus_message_new_method_return(message)))
-                goto oom;
-
-        if (!bus_maybe_send_reply(connection, message, reply))
-                goto oom;
 
-        dbus_message_unref(reply);
-        reply = NULL;
+                log_info("Changed X11 keyboard layout to '%s'", strempty(c->x11_layout));
 
-        if (changed) {
-
-                if (!dbus_connection_send(connection, changed, NULL))
-                        goto oom;
+                sd_bus_emit_properties_changed(bus,
+                                "/org/freedesktop/locale1",
+                                "org.freedesktop.locale1",
+                                "X11Layout" "X11Model" "X11Variant" "X11Options", NULL);
 
-                dbus_message_unref(changed);
+                if (convert) {
+                        r = x11_convert_to_vconsole(c, bus);
+                        if (r < 0)
+                                log_error("Failed to convert keymap data: %s", strerror(-r));
+                }
         }
 
-        return DBUS_HANDLER_RESULT_HANDLED;
-
-oom:
-        if (reply)
-                dbus_message_unref(reply);
-
-        if (changed)
-                dbus_message_unref(changed);
-
-        dbus_error_free(&error);
-
-        return DBUS_HANDLER_RESULT_NEED_MEMORY;
+        return sd_bus_reply_method_return(bus, m, NULL);
 }
 
-static int connect_bus(DBusConnection **_bus) {
-        static const DBusObjectPathVTable locale_vtable = {
-                .message_function = locale_message_handler
-        };
-        DBusError error;
-        DBusConnection *bus = NULL;
+static const sd_bus_vtable locale_vtable[] = {
+        SD_BUS_VTABLE_START(0),
+        SD_BUS_PROPERTY("Locale", "as", property_get_locale, 0, 0),
+        SD_BUS_PROPERTY("X11Layout", "s", NULL, offsetof(Context, x11_layout), 0),
+        SD_BUS_PROPERTY("X11Model", "s", NULL, offsetof(Context, x11_model), 0),
+        SD_BUS_PROPERTY("X11Variant", "s", NULL, offsetof(Context, x11_variant), 0),
+        SD_BUS_PROPERTY("X11Options", "s", NULL, offsetof(Context, x11_options), 0),
+        SD_BUS_PROPERTY("VConsoleKeymap", "s", NULL, offsetof(Context, vc_keymap), 0),
+        SD_BUS_PROPERTY("VConsoleKeymapToggle", "s", NULL, offsetof(Context, vc_keymap_toggle), 0),
+        SD_BUS_METHOD("SetLocale", "asb", NULL, method_set_locale, 0),
+        SD_BUS_METHOD("SetVConsoleKeyboard", "ssbb", NULL, method_set_vc_keyboard, 0),
+        SD_BUS_METHOD("SetX11Keyboard", "ssssbb", NULL, method_set_x11_keyboard, 0),
+        SD_BUS_VTABLE_END
+};
+
+static int connect_bus(Context *c, sd_event *event, sd_bus **_bus) {
+        _cleanup_bus_unref_ sd_bus *bus = NULL;
         int r;
 
+        assert(c);
+        assert(event);
         assert(_bus);
 
-        dbus_error_init(&error);
-
-        bus = dbus_bus_get_private(DBUS_BUS_SYSTEM, &error);
-        if (!bus) {
-                log_error("Failed to get system D-Bus connection: %s", bus_error_message(&error));
-                r = -ECONNREFUSED;
-                goto fail;
+        r = sd_bus_open_system(&bus);
+        if (r < 0) {
+                log_error("Failed to get system bus connection: %s", strerror(-r));
+                return r;
         }
 
-        dbus_connection_set_exit_on_disconnect(bus, FALSE);
-
-        if (!dbus_connection_register_object_path(bus, "/org/freedesktop/locale1", &locale_vtable, NULL) ||
-            !dbus_connection_add_filter(bus, bus_exit_idle_filter, &remain_until, NULL)) {
-                r = log_oom();
-                goto fail;
+        r = sd_bus_add_object_vtable(bus, "/org/freedesktop/locale1", "org.freedesktop.locale1", locale_vtable, c);
+        if (r < 0) {
+                log_error("Failed to register object: %s", strerror(-r));
+                return r;
         }
 
-        r = dbus_bus_request_name(bus, "org.freedesktop.locale1", DBUS_NAME_FLAG_DO_NOT_QUEUE, &error);
-        if (dbus_error_is_set(&error)) {
-                log_error("Failed to register name on bus: %s", bus_error_message(&error));
-                r = -EEXIST;
-                goto fail;
+        r = sd_bus_request_name(bus, "org.freedesktop.locale1", SD_BUS_NAME_DO_NOT_QUEUE);
+        if (r < 0) {
+                log_error("Failed to register name: %s", strerror(-r));
+                return r;
         }
 
-        if (r != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
+        if (r != SD_BUS_NAME_PRIMARY_OWNER) {
                 log_error("Failed to acquire name.");
-                r = -EEXIST;
-                goto fail;
+                return -EEXIST;
         }
 
-        if (_bus)
-                *_bus = bus;
-
-        return 0;
-
-fail:
-        dbus_connection_close(bus);
-        dbus_connection_unref(bus);
+        r = sd_bus_attach_event(bus, event, 0);
+        if (r < 0) {
+                log_error("Failed to attach bus to event loop: %s", strerror(-r));
+                return r;
+        }
 
-        dbus_error_free(&error);
+        *_bus = bus;
+        bus = NULL;
 
-        return r;
+        return 0;
 }
 
 int main(int argc, char *argv[]) {
+        Context context = {};
+        _cleanup_event_unref_ sd_event *event = NULL;
+        _cleanup_bus_unref_ sd_bus *bus = NULL;
         int r;
-        DBusConnection *bus = NULL;
-        bool exiting = false;
 
         log_set_target(LOG_TARGET_AUTO);
         log_parse_environment();
         log_open();
-        label_init("/etc");
+
         umask(0022);
+        label_init("/etc");
 
         if (argc != 1) {
                 log_error("This program takes no arguments.");
@@ -1342,38 +1115,32 @@ int main(int argc, char *argv[]) {
                 goto finish;
         }
 
-        r = read_data();
+        r = sd_event_new(&event);
         if (r < 0) {
-                log_error("Failed to read locale data: %s", strerror(-r));
+                log_error("Failed to allocate event loop: %s", strerror(-r));
                 goto finish;
         }
 
-        r = connect_bus(&bus);
+        r = connect_bus(&context, event, &bus);
         if (r < 0)
                 goto finish;
 
-        remain_until = now(CLOCK_MONOTONIC) + DEFAULT_EXIT_USEC;
-        for (;;) {
-
-                if (!dbus_connection_read_write_dispatch(bus, exiting ? -1 : (int) (DEFAULT_EXIT_USEC/USEC_PER_MSEC)))
-                        break;
+        r = context_read_data(&context);
+        if (r < 0) {
+                log_error("Failed to read locale data: %s", strerror(-r));
+                goto finish;
+        }
 
-                if (!exiting && remain_until < now(CLOCK_MONOTONIC)) {
-                        exiting = true;
-                        bus_async_unregister_and_exit(bus, "org.freedesktop.locale1");
-                }
+        r = bus_event_loop_with_idle(event, bus, "org.freedesktop.locale1", DEFAULT_EXIT_USEC);
+        if (r < 0) {
+                log_error("Failed to run event loop: %s", strerror(-r));
+                goto finish;
         }
 
         r = 0;
 
 finish:
-        free_data();
-
-        if (bus) {
-                dbus_connection_flush(bus);
-                dbus_connection_close(bus);
-                dbus_connection_unref(bus);
-        }
+        context_free(&context, bus);
 
         return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
 }