locale: make sure that l is freed

[elogind.git] / src / locale / localed.c

diff --git a/src/locale/localed.c b/src/locale/localed.c
index c6b48de5f9c0c3e68136d5121062c976e3aa85c1..a2d381406c6da0ac3beb9809e154b4da7e9ae7ca 100644 (file)
--- a/src/locale/localed.c
+++ b/src/locale/localed.c
@@ -6,16 +6,16 @@
   Copyright 2011 Lennart Poettering
 
   systemd is free software; you can redistribute it and/or modify it
   Copyright 2011 Lennart Poettering
 
   systemd is free software; you can redistribute it and/or modify it

-  under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
+  under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or

   (at your option) any later version.
 
   systemd is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   (at your option) any later version.
 
   systemd is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

-  General Public License for more details.
+  Lesser General Public License for more details.

 
 

-  You should have received a copy of the GNU General Public License
+  You should have received a copy of the GNU Lesser General Public License

   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 


@@ -26,6 +26,7 @@
 #include <unistd.h>
 
 #include "util.h"
 #include <unistd.h>
 
 #include "util.h"

+#include "mkdir.h"

 #include "strv.h"
 #include "dbus-common.h"
 #include "polkit.h"
 #include "strv.h"
 #include "dbus-common.h"
 #include "polkit.h"


@@ -129,8 +130,12 @@ static char *data[_PROP_MAX] = {
         NULL
 };
 
         NULL
 };
 

-static char *x11_layout = NULL, *x11_model = NULL, *x11_variant = NULL, *x11_options = NULL;
-static char *vc_keymap = NULL, *vc_keymap_toggle = NULL;
+typedef struct State {
+        char *x11_layout, *x11_model, *x11_variant, *x11_options;
+        char *vc_keymap, *vc_keymap_toggle;
+} State;
+
+static State state;

 
 static usec_t remain_until = 0;
 
 
 static usec_t remain_until = 0;
 


@@ -160,19 +165,19 @@ static void free_data_locale(void) {
 }
 
 static void free_data_x11(void) {
 }
 
 static void free_data_x11(void) {

-        free(x11_layout);
-        free(x11_model);
-        free(x11_variant);
-        free(x11_options);
+        free(state.x11_layout);
+        free(state.x11_model);
+        free(state.x11_variant);
+        free(state.x11_options);

 
 

-        x11_layout = x11_model = x11_variant = x11_options = NULL;
+        state.x11_layout = state.x11_model = state.x11_variant = state.x11_options = NULL;

 }
 
 static void free_data_vconsole(void) {
 }
 
 static void free_data_vconsole(void) {

-        free(vc_keymap);
-        free(vc_keymap_toggle);
+        free(state.vc_keymap);
+        free(state.vc_keymap_toggle);

 
 

-        vc_keymap = vc_keymap_toggle = NULL;
+        state.vc_keymap = state.vc_keymap_toggle = NULL;

 }
 
 static void simplify(void) {
 }
 
 static void simplify(void) {


@@ -248,8 +253,8 @@ static int read_data_vconsole(void) {
         free_data_vconsole();
 
         r = parse_env_file("/etc/vconsole.conf", NEWLINE,
         free_data_vconsole();
 
         r = parse_env_file("/etc/vconsole.conf", NEWLINE,

-                           "KEYMAP",        &vc_keymap,
-                           "KEYMAP_TOGGLE", &vc_keymap_toggle,
+                           "KEYMAP",        &state.vc_keymap,
+                           "KEYMAP_TOGGLE", &state.vc_keymap_toggle,

                            NULL);
 
         if (r < 0 && r != -ENOENT)
                            NULL);
 
         if (r < 0 && r != -ENOENT)


@@ -266,24 +271,8 @@ static int read_data_x11(void) {
         free_data_x11();
 
         f = fopen("/etc/X11/xorg.conf.d/00-keyboard.conf", "re");
         free_data_x11();
 
         f = fopen("/etc/X11/xorg.conf.d/00-keyboard.conf", "re");

-        if (!f) {
-                if (errno == ENOENT) {
-
-#ifdef TARGET_FEDORA
-                        f = fopen("/etc/X11/xorg.conf.d/00-system-setup-keyboard.conf", "re");
-                        if (!f) {
-                                if (errno == ENOENT)
-                                        return 0;
-                                else
-                                        return -errno;
-                        }
-#else
-                        return 0;
-#endif
-
-                } else
-                          return -errno;
-        }
+        if (!f)
+                return errno == ENOENT ? 0 : -errno;

 
         while (fgets(line, sizeof(line), f)) {
                 char *l;
 
         while (fgets(line, sizeof(line), f)) {
                 char *l;


@@ -306,20 +295,20 @@ static int read_data_x11(void) {
                         if (strv_length(a) == 3) {
 
                                 if (streq(a[1], "XkbLayout")) {
                         if (strv_length(a) == 3) {
 
                                 if (streq(a[1], "XkbLayout")) {

-                                        free(x11_layout);
-                                        x11_layout = a[2];
+                                        free(state.x11_layout);
+                                        state.x11_layout = a[2];

                                         a[2] = NULL;
                                 } else if (streq(a[1], "XkbModel")) {
                                         a[2] = NULL;
                                 } else if (streq(a[1], "XkbModel")) {

-                                        free(x11_model);
-                                        x11_model = a[2];
+                                        free(state.x11_model);
+                                        state.x11_model = a[2];

                                         a[2] = NULL;
                                 } else if (streq(a[1], "XkbVariant")) {
                                         a[2] = NULL;
                                 } else if (streq(a[1], "XkbVariant")) {

-                                        free(x11_variant);
-                                        x11_variant = a[2];
+                                        free(state.x11_variant);
+                                        state.x11_variant = a[2];

                                         a[2] = NULL;
                                 } else if (streq(a[1], "XkbOptions")) {
                                         a[2] = NULL;
                                 } else if (streq(a[1], "XkbOptions")) {

-                                        free(x11_options);
-                                        x11_options = a[2];
+                                        free(state.x11_options);
+                                        state.x11_options = a[2];

                                         a[2] = NULL;
                                 }
                         }
                                         a[2] = NULL;
                                 }
                         }


@@ -420,7 +409,7 @@ static void push_data(DBusConnection *bus) {
         l_set = new0(char*, _PROP_MAX);
         l_unset = new0(char*, _PROP_MAX);
         if (!l_set || !l_unset) {
         l_set = new0(char*, _PROP_MAX);
         l_unset = new0(char*, _PROP_MAX);
         if (!l_set || !l_unset) {

-                log_error("Out of memory");
+                log_oom();

                 goto finish;
         }
 
                 goto finish;
         }
 


@@ -433,7 +422,7 @@ static void push_data(DBusConnection *bus) {
                         char *s;
 
                         if (asprintf(&s, "%s=%s", names[p], data[p]) < 0) {
                         char *s;
 
                         if (asprintf(&s, "%s=%s", names[p], data[p]) < 0) {

-                                log_error("Out of memory");
+                                log_oom();

                                 goto finish;
                         }
 
                                 goto finish;
                         }
 


@@ -451,30 +440,30 @@ static void push_data(DBusConnection *bus) {
         dbus_message_iter_init_append(m, &iter);
 
         if (!dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, "s", &sub)) {
         dbus_message_iter_init_append(m, &iter);
 
         if (!dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, "s", &sub)) {

-                log_error("Out of memory.");
+                log_oom();

                 goto finish;
         }
 
         STRV_FOREACH(t, l_unset)
                 if (!dbus_message_iter_append_basic(&sub, DBUS_TYPE_STRING, t)) {
                 goto finish;
         }
 
         STRV_FOREACH(t, l_unset)
                 if (!dbus_message_iter_append_basic(&sub, DBUS_TYPE_STRING, t)) {

-                        log_error("Out of memory.");
+                        log_oom();

                         goto finish;
                 }
 
         if (!dbus_message_iter_close_container(&iter, &sub) ||
             !dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, "s", &sub)) {
                         goto finish;
                 }
 
         if (!dbus_message_iter_close_container(&iter, &sub) ||
             !dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, "s", &sub)) {

-                log_error("Out of memory.");
+                log_oom();

                 goto finish;
         }
 
         STRV_FOREACH(t, l_set)
                 if (!dbus_message_iter_append_basic(&sub, DBUS_TYPE_STRING, t)) {
                 goto finish;
         }
 
         STRV_FOREACH(t, l_set)
                 if (!dbus_message_iter_append_basic(&sub, DBUS_TYPE_STRING, t)) {

-                        log_error("Out of memory.");
+                        log_oom();

                         goto finish;
                 }
 
         if (!dbus_message_iter_close_container(&iter, &sub)) {
                         goto finish;
                 }
 
         if (!dbus_message_iter_close_container(&iter, &sub)) {

-                log_error("Out of memory.");
+                log_oom();

                 goto finish;
         }
 
                 goto finish;
         }
 


@@ -505,12 +494,12 @@ static int write_data_vconsole(void) {
         if (r < 0 && r != -ENOENT)
                 return r;
 
         if (r < 0 && r != -ENOENT)
                 return r;
 

-        if (isempty(vc_keymap))
+        if (isempty(state.vc_keymap))

                 l = strv_env_unset(l, "KEYMAP");
         else {
                 char *s, **u;
 
                 l = strv_env_unset(l, "KEYMAP");
         else {
                 char *s, **u;
 

-                s = strappend("KEYMAP=", vc_keymap);
+                s = strappend("KEYMAP=", state.vc_keymap);

                 if (!s) {
                         strv_free(l);
                         return -ENOMEM;
                 if (!s) {
                         strv_free(l);
                         return -ENOMEM;


@@ -526,12 +515,12 @@ static int write_data_vconsole(void) {
                 l = u;
         }
 
                 l = u;
         }
 

-        if (isempty(vc_keymap_toggle))
+        if (isempty(state.vc_keymap_toggle))

                 l = strv_env_unset(l, "KEYMAP_TOGGLE");
         else  {
                 char *s, **u;
 
                 l = strv_env_unset(l, "KEYMAP_TOGGLE");
         else  {
                 char *s, **u;
 

-                s = strappend("KEYMAP_TOGGLE=", vc_keymap_toggle);
+                s = strappend("KEYMAP_TOGGLE=", state.vc_keymap_toggle);

                 if (!s) {
                         strv_free(l);
                         return -ENOMEM;
                 if (!s) {
                         strv_free(l);
                         return -ENOMEM;


@@ -567,18 +556,10 @@ static int write_data_x11(void) {
         char *temp_path;
         int r;
 
         char *temp_path;
         int r;
 

-        if (isempty(x11_layout) &&
-            isempty(x11_model) &&
-            isempty(x11_variant) &&
-            isempty(x11_options)) {
-
-#ifdef TARGET_FEDORA
-                unlink("/etc/X11/xorg.conf.d/00-system-setup-keyboard.conf");
-
-                /* Symlink this to /dev/null, so that s-s-k (if it is
-                 * still running) doesn't recreate this. */
-                symlink("/dev/null", "/etc/X11/xorg.conf.d/00-system-setup-keyboard.conf");
-#endif
+        if (isempty(state.x11_layout) &&
+            isempty(state.x11_model) &&
+            isempty(state.x11_variant) &&
+            isempty(state.x11_options)) {

 
                 if (unlink("/etc/X11/xorg.conf.d/00-keyboard.conf") < 0)
                         return errno == ENOENT ? 0 : -errno;
 
                 if (unlink("/etc/X11/xorg.conf.d/00-keyboard.conf") < 0)
                         return errno == ENOENT ? 0 : -errno;


@@ -586,7 +567,7 @@ static int write_data_x11(void) {
                 return 0;
         }
 
                 return 0;
         }
 

-        mkdir_parents("/etc/X11/xorg.conf.d", 0755);
+        mkdir_parents_label("/etc/X11/xorg.conf.d", 0755);

 
         r = fopen_temporary("/etc/X11/xorg.conf.d/00-keyboard.conf", &f, &temp_path);
         if (r < 0)
 
         r = fopen_temporary("/etc/X11/xorg.conf.d/00-keyboard.conf", &f, &temp_path);
         if (r < 0)


@@ -600,17 +581,17 @@ static int write_data_x11(void) {
               "        Identifier \"system-keyboard\"\n"
               "        MatchIsKeyboard \"on\"\n", f);
 
               "        Identifier \"system-keyboard\"\n"
               "        MatchIsKeyboard \"on\"\n", f);
 

-        if (!isempty(x11_layout))
-                fprintf(f, "        Option \"XkbLayout\" \"%s\"\n", x11_layout);
+        if (!isempty(state.x11_layout))
+                fprintf(f, "        Option \"XkbLayout\" \"%s\"\n", state.x11_layout);

 
 

-        if (!isempty(x11_model))
-                fprintf(f, "        Option \"XkbModel\" \"%s\"\n", x11_model);
+        if (!isempty(state.x11_model))
+                fprintf(f, "        Option \"XkbModel\" \"%s\"\n", state.x11_model);

 
 

-        if (!isempty(x11_variant))
-                fprintf(f, "        Option \"XkbVariant\" \"%s\"\n", x11_variant);
+        if (!isempty(state.x11_variant))
+                fprintf(f, "        Option \"XkbVariant\" \"%s\"\n", state.x11_variant);

 
 

-        if (!isempty(x11_options))
-                fprintf(f, "        Option \"XkbOptions\" \"%s\"\n", x11_options);
+        if (!isempty(state.x11_options))
+                fprintf(f, "        Option \"XkbOptions\" \"%s\"\n", state.x11_options);

 
         fputs("EndSection\n", f);
         fflush(f);
 
         fputs("EndSection\n", f);
         fflush(f);


@@ -619,18 +600,8 @@ static int write_data_x11(void) {
                 r = -errno;
                 unlink("/etc/X11/xorg.conf.d/00-keyboard.conf");
                 unlink(temp_path);
                 r = -errno;
                 unlink("/etc/X11/xorg.conf.d/00-keyboard.conf");
                 unlink(temp_path);

-        } else {
-
-#ifdef TARGET_FEDORA
-                unlink("/etc/X11/xorg.conf.d/00-system-setup-keyboard.conf");
-
-                /* Symlink this to /dev/null, so that s-s-k (if it is
-                 * still running) doesn't recreate this. */
-                symlink("/dev/null", "/etc/X11/xorg.conf.d/00-system-setup-keyboard.conf");
-#endif
-
+        } else

                 r = 0;
                 r = 0;

-        }

 
         fclose(f);
         free(temp_path);
 
         fclose(f);
         free(temp_path);


@@ -742,13 +713,13 @@ static int convert_vconsole_to_x11(DBusConnection *connection) {
 
         assert(connection);
 
 
         assert(connection);
 

-        if (isempty(vc_keymap)) {
+        if (isempty(state.vc_keymap)) {

 
                 modified =
 
                 modified =

-                        !isempty(x11_layout) ||
-                        !isempty(x11_model) ||
-                        !isempty(x11_variant) ||
-                        !isempty(x11_options);
+                        !isempty(state.x11_layout) ||
+                        !isempty(state.x11_model) ||
+                        !isempty(state.x11_variant) ||
+                        !isempty(state.x11_options);

 
                 free_data_x11();
         } else {
 
                 free_data_x11();
         } else {


@@ -772,20 +743,20 @@ static int convert_vconsole_to_x11(DBusConnection *connection) {
                         if (r == 0)
                                 break;
 
                         if (r == 0)
                                 break;
 

-                        if (!streq(vc_keymap, a[0])) {
+                        if (!streq(state.vc_keymap, a[0])) {

                                 strv_free(a);
                                 continue;
                         }
 
                                 strv_free(a);
                                 continue;
                         }
 

-                        if (!streq_ptr(x11_layout, strnulldash(a[1])) ||
-                            !streq_ptr(x11_model, strnulldash(a[2])) ||
-                            !streq_ptr(x11_variant, strnulldash(a[3])) ||
-                            !streq_ptr(x11_options, strnulldash(a[4]))) {
+                        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 (free_and_set(&x11_layout, strnulldash(a[1])) < 0 ||
-                                    free_and_set(&x11_model, strnulldash(a[2])) < 0 ||
-                                    free_and_set(&x11_variant, strnulldash(a[3])) < 0 ||
-                                    free_and_set(&x11_options, strnulldash(a[4])) < 0) {
+                                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) {

                                         strv_free(a);
                                         fclose(f);
                                         return -ENOMEM;
                                         strv_free(a);
                                         fclose(f);
                                         return -ENOMEM;


@@ -836,11 +807,11 @@ static int convert_x11_to_vconsole(DBusConnection *connection) {
 
         assert(connection);
 
 
         assert(connection);
 

-        if (isempty(x11_layout)) {
+        if (isempty(state.x11_layout)) {

 
                 modified =
 
                 modified =

-                        !isempty(vc_keymap) ||
-                        !isempty(vc_keymap_toggle);
+                        !isempty(state.vc_keymap) ||
+                        !isempty(state.vc_keymap_toggle);

 
                 free_data_x11();
         } else {
 
                 free_data_x11();
         } else {


@@ -868,13 +839,13 @@ static int convert_x11_to_vconsole(DBusConnection *connection) {
                                 break;
 
                         /* Determine how well matching this entry is */
                                 break;
 
                         /* Determine how well matching this entry is */

-                        if (streq_ptr(x11_layout, a[1]))
+                        if (streq_ptr(state.x11_layout, a[1]))

                                 /* If we got an exact match, this is best */
                                 matching = 10;
                         else {
                                 size_t x;
 
                                 /* If we got an exact match, this is best */
                                 matching = 10;
                         else {
                                 size_t x;
 

-                                x = strcspn(x11_layout, ",");
+                                x = strcspn(state.x11_layout, ",");

 
                                 /* We have multiple X layouts, look
                                  * for an entry that matches our key
 
                                 /* We have multiple X layouts, look
                                  * for an entry that matches our key


@@ -882,7 +853,7 @@ static int convert_x11_to_vconsole(DBusConnection *connection) {
                                  * layout stripped off. */
                                 if (x > 0 &&
                                     strlen(a[1]) == x &&
                                  * layout stripped off. */
                                 if (x > 0 &&
                                     strlen(a[1]) == x &&

-                                    strncmp(x11_layout, a[1], x) == 0)
+                                    strncmp(state.x11_layout, a[1], x) == 0)

                                         matching = 5;
                                 else  {
                                         size_t w;
                                         matching = 5;
                                 else  {
                                         size_t w;


@@ -894,19 +865,19 @@ static int convert_x11_to_vconsole(DBusConnection *connection) {
                                         w = strcspn(a[1], ",");
 
                                         if (x > 0 && x == w &&
                                         w = strcspn(a[1], ",");
 
                                         if (x > 0 && x == w &&

-                                            memcmp(x11_layout, a[1], x) == 0)
+                                            memcmp(state.x11_layout, a[1], x) == 0)

                                                 matching = 1;
                                 }
                         }
 
                         if (matching > 0 &&
                                                 matching = 1;
                                 }
                         }
 
                         if (matching > 0 &&

-                            streq_ptr(x11_model, a[2])) {
+                            streq_ptr(state.x11_model, a[2])) {

                                 matching++;
 
                                 matching++;
 

-                                if (streq_ptr(x11_variant, a[3])) {
+                                if (streq_ptr(state.x11_variant, a[3])) {

                                         matching++;
 
                                         matching++;
 

-                                        if (streq_ptr(x11_options, a[4]))
+                                        if (streq_ptr(state.x11_options, a[4]))

                                                 matching++;
                                 }
                         }
                                                 matching++;
                                 }
                         }


@@ -931,12 +902,12 @@ static int convert_x11_to_vconsole(DBusConnection *connection) {
 
                 fclose(f);
 
 
                 fclose(f);
 

-                if (!streq_ptr(vc_keymap, new_keymap)) {
-                        free(vc_keymap);
-                        vc_keymap = new_keymap;
+                if (!streq_ptr(state.vc_keymap, new_keymap)) {
+                        free(state.vc_keymap);
+                        state.vc_keymap = new_keymap;

 
 

-                        free(vc_keymap_toggle);
-                        vc_keymap_toggle = NULL;
+                        free(state.vc_keymap_toggle);
+                        state.vc_keymap_toggle = NULL;

 
                         modified = true;
                 } else
 
                         modified = true;
                 } else


@@ -1001,22 +972,27 @@ static int append_locale(DBusMessageIter *i, const char *property, void *userdat
         return r;
 }
 
         return r;
 }
 

+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) {
 
 static DBusHandlerResult locale_message_handler(
                 DBusConnection *connection,
                 DBusMessage *message,
                 void *userdata) {
 

-        const BusProperty properties[] = {
-                { "org.freedesktop.locale1", "Locale",               append_locale,              "as", NULL                   },
-                { "org.freedesktop.locale1", "X11Layout",            bus_property_append_string, "s",  x11_layout             },
-                { "org.freedesktop.locale1", "X11Model",             bus_property_append_string, "s",  x11_model              },
-                { "org.freedesktop.locale1", "X11Variant",           bus_property_append_string, "s",  x11_variant            },
-                { "org.freedesktop.locale1", "X11Options",           bus_property_append_string, "s",  x11_options            },
-                { "org.freedesktop.locale1", "VConsoleKeymap",       bus_property_append_string, "s",  vc_keymap              },
-                { "org.freedesktop.locale1", "VConsoleKeymapToggle", bus_property_append_string, "s",  vc_keymap_toggle       },
-                { NULL, NULL, NULL, NULL, NULL }
-        };
-

         DBusMessage *reply = NULL, *changed = NULL;
         DBusError error;
         int r;
         DBusMessage *reply = NULL, *changed = NULL;
         DBusError error;
         int r;


@@ -1091,7 +1067,7 @@ static DBusHandlerResult locale_message_handler(
 
                 if (modified) {
 
 
                 if (modified) {
 

-                        r = verify_polkit(connection, message, "org.freedesktop.locale1.set-locale", interactive, &error);
+                        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);
                         if (r < 0) {
                                 strv_free(l);
                                 return bus_send_error_reply(connection, message, &error, r);


@@ -1147,7 +1123,9 @@ static DBusHandlerResult locale_message_handler(
                                         "Locale\0");
                         if (!changed)
                                 goto oom;
                                         "Locale\0");
                         if (!changed)
                                 goto oom;

-                }
+                } else
+                        strv_free(l);
+

         } else if (dbus_message_is_method_call(message, "org.freedesktop.locale1", "SetVConsoleKeyboard")) {
 
                 const char *keymap, *keymap_toggle;
         } else if (dbus_message_is_method_call(message, "org.freedesktop.locale1", "SetVConsoleKeyboard")) {
 
                 const char *keymap, *keymap_toggle;


@@ -1169,15 +1147,15 @@ static DBusHandlerResult locale_message_handler(
                 if (isempty(keymap_toggle))
                         keymap_toggle = NULL;
 
                 if (isempty(keymap_toggle))
                         keymap_toggle = NULL;
 

-                if (!streq_ptr(keymap, vc_keymap) ||
-                    !streq_ptr(keymap_toggle, vc_keymap_toggle)) {
+                if (!streq_ptr(keymap, state.vc_keymap) ||
+                    !streq_ptr(keymap_toggle, state.vc_keymap_toggle)) {

 
 

-                        r = verify_polkit(connection, message, "org.freedesktop.locale1.set-keyboard", interactive, &error);
+                        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 (r < 0)
                                 return bus_send_error_reply(connection, message, &error, r);
 

-                        if (free_and_set(&vc_keymap, keymap) < 0 ||
-                            free_and_set(&vc_keymap_toggle, keymap_toggle) < 0)
+                        if (free_and_set(&state.vc_keymap, keymap) < 0 ||
+                            free_and_set(&state.vc_keymap_toggle, keymap_toggle) < 0)

                                 goto oom;
 
                         r = write_data_vconsole();
                                 goto oom;
 
                         r = write_data_vconsole();


@@ -1186,7 +1164,7 @@ static DBusHandlerResult locale_message_handler(
                                 return bus_send_error_reply(connection, message, NULL, r);
                         }
 
                                 return bus_send_error_reply(connection, message, NULL, r);
                         }
 

-                        log_info("Changed virtual console keymap to '%s'", strempty(vc_keymap));
+                        log_info("Changed virtual console keymap to '%s'", strempty(state.vc_keymap));

 
                         r = load_vconsole_keymap(connection, NULL);
                         if (r < 0)
 
                         r = load_vconsole_keymap(connection, NULL);
                         if (r < 0)


@@ -1237,19 +1215,19 @@ static DBusHandlerResult locale_message_handler(
                 if (isempty(options))
                         options = NULL;
 
                 if (isempty(options))
                         options = NULL;
 

-                if (!streq_ptr(layout, x11_layout) ||
-                    !streq_ptr(model, x11_model) ||
-                    !streq_ptr(variant, x11_variant) ||
-                    !streq_ptr(options, x11_options)) {
+                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 = verify_polkit(connection, message, "org.freedesktop.locale1.set-keyboard", interactive, &error);
+                        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 (r < 0)
                                 return bus_send_error_reply(connection, message, &error, r);
 

-                        if (free_and_set(&x11_layout, layout) < 0 ||
-                            free_and_set(&x11_model, model) < 0 ||
-                            free_and_set(&x11_variant, variant) < 0 ||
-                            free_and_set(&x11_options, options) < 0)
+                        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;
 
                         r = write_data_x11();
                                 goto oom;
 
                         r = write_data_x11();


@@ -1258,7 +1236,7 @@ static DBusHandlerResult locale_message_handler(
                                 return bus_send_error_reply(connection, message, NULL, r);
                         }
 
                                 return bus_send_error_reply(connection, message, NULL, r);
                         }
 

-                        log_info("Changed X11 keyboard layout to '%s'", strempty(x11_layout));
+                        log_info("Changed X11 keyboard layout to '%s'", strempty(state.x11_layout));

 
                         changed = bus_properties_changed_new(
                                         "/org/freedesktop/locale1",
 
                         changed = bus_properties_changed_new(
                                         "/org/freedesktop/locale1",


@@ -1278,8 +1256,7 @@ static DBusHandlerResult locale_message_handler(
                         }
                 }
         } else
                         }
                 }
         } else

-                return bus_default_message_handler(connection, message, INTROSPECTION, INTERFACES_LIST, properties);
-
+                return bus_default_message_handler(connection, message, INTROSPECTION, INTERFACES_LIST, bps);

 
         if (!(reply = dbus_message_new_method_return(message)))
                 goto oom;
 
         if (!(reply = dbus_message_new_method_return(message)))
                 goto oom;


@@ -1335,8 +1312,7 @@ static int connect_bus(DBusConnection **_bus) {
 
         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)) {
 
         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)) {

-                log_error("Not enough memory");
-                r = -ENOMEM;
+                r = log_oom();

                 goto fail;
         }
 
                 goto fail;
         }