2011-12-31 06:50:34 +01:00
|
|
|
/***
|
|
|
|
This file is part of systemd.
|
|
|
|
|
|
|
|
Copyright 2011 Lennart Poettering
|
2013-10-22 13:19:56 +02:00
|
|
|
Copyright 2013 Kay Sievers
|
2011-12-31 06:50:34 +01:00
|
|
|
|
|
|
|
systemd is free software; you can redistribute it and/or modify it
|
2012-04-12 00:20:58 +02:00
|
|
|
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
|
2011-12-31 06:50:34 +01:00
|
|
|
(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
|
2012-04-12 00:20:58 +02:00
|
|
|
Lesser General Public License for more details.
|
2011-12-31 06:50:34 +01:00
|
|
|
|
2012-04-12 00:20:58 +02:00
|
|
|
You should have received a copy of the GNU Lesser General Public License
|
2011-12-31 06:50:34 +01:00
|
|
|
along with systemd; If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
***/
|
|
|
|
|
|
|
|
#include <errno.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <unistd.h>
|
|
|
|
|
2015-10-25 13:14:12 +01:00
|
|
|
#ifdef HAVE_XKBCOMMON
|
|
|
|
#include <xkbcommon/xkbcommon.h>
|
2016-04-06 18:23:37 +02:00
|
|
|
#include <dlfcn.h>
|
2015-10-25 13:14:12 +01:00
|
|
|
#endif
|
|
|
|
|
2013-10-22 13:19:56 +02:00
|
|
|
#include "sd-bus.h"
|
|
|
|
|
2015-10-27 03:01:06 +01:00
|
|
|
#include "alloc-util.h"
|
2013-10-22 13:19:56 +02:00
|
|
|
#include "bus-error.h"
|
|
|
|
#include "bus-message.h"
|
2015-10-26 18:59:36 +01:00
|
|
|
#include "bus-util.h"
|
|
|
|
#include "def.h"
|
2016-05-26 19:35:20 +02:00
|
|
|
#include "keymap-util.h"
|
2014-07-07 11:49:48 +02:00
|
|
|
#include "locale-util.h"
|
2016-05-26 19:35:20 +02:00
|
|
|
#include "macro.h"
|
2015-10-26 18:59:36 +01:00
|
|
|
#include "path-util.h"
|
2014-12-27 18:46:36 +01:00
|
|
|
#include "selinux-util.h"
|
2016-05-26 19:35:20 +02:00
|
|
|
#include "string-util.h"
|
2015-10-26 18:59:36 +01:00
|
|
|
#include "strv.h"
|
2015-10-27 00:42:07 +01:00
|
|
|
#include "user-util.h"
|
2014-11-24 15:12:42 +01:00
|
|
|
|
2016-05-26 19:35:20 +02:00
|
|
|
static Hashmap *polkit_registry = NULL;
|
2011-12-31 06:50:34 +01:00
|
|
|
|
2013-10-22 13:19:56 +02:00
|
|
|
static int locale_update_system_manager(Context *c, sd_bus *bus) {
|
|
|
|
_cleanup_free_ char **l_unset = NULL;
|
|
|
|
_cleanup_strv_free_ char **l_set = NULL;
|
tree-wide: expose "p"-suffix unref calls in public APIs to make gcc cleanup easy
GLIB has recently started to officially support the gcc cleanup
attribute in its public API, hence let's do the same for our APIs.
With this patch we'll define an xyz_unrefp() call for each public
xyz_unref() call, to make it easy to use inside a
__attribute__((cleanup())) expression. Then, all code is ported over to
make use of this.
The new calls are also documented in the man pages, with examples how to
use them (well, I only added docs where the _unref() call itself already
had docs, and the examples, only cover sd_bus_unrefp() and
sd_event_unrefp()).
This also renames sd_lldp_free() to sd_lldp_unref(), since that's how we
tend to call our destructors these days.
Note that this defines no public macro that wraps gcc's attribute and
makes it easier to use. While I think it's our duty in the library to
make our stuff easy to use, I figure it's not our duty to make gcc's own
features easy to use on its own. Most likely, client code which wants to
make use of this should define its own:
#define _cleanup_(function) __attribute__((cleanup(function)))
Or similar, to make the gcc feature easier to use.
Making this logic public has the benefit that we can remove three header
files whose only purpose was to define these functions internally.
See #2008.
2015-11-27 19:13:45 +01:00
|
|
|
_cleanup_(sd_bus_message_unrefp) sd_bus_message *m = NULL;
|
2013-10-22 13:19:56 +02:00
|
|
|
sd_bus_error error = SD_BUS_ERROR_NULL;
|
|
|
|
unsigned c_set, c_unset, p;
|
|
|
|
int r;
|
2011-12-31 06:50:34 +01:00
|
|
|
|
|
|
|
assert(bus);
|
|
|
|
|
2016-05-26 19:46:56 +02:00
|
|
|
l_unset = new0(char*, _VARIABLE_LC_MAX);
|
2013-10-22 13:19:56 +02:00
|
|
|
if (!l_unset)
|
|
|
|
return -ENOMEM;
|
2011-12-31 06:50:34 +01:00
|
|
|
|
2016-05-26 19:46:56 +02:00
|
|
|
l_set = new0(char*, _VARIABLE_LC_MAX);
|
2013-10-22 13:19:56 +02:00
|
|
|
if (!l_set)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
2016-05-26 19:46:56 +02:00
|
|
|
for (p = 0, c_set = 0, c_unset = 0; p < _VARIABLE_LC_MAX; p++) {
|
|
|
|
const char *name;
|
|
|
|
|
|
|
|
name = locale_variable_to_string(p);
|
|
|
|
assert(name);
|
2011-12-31 06:50:34 +01:00
|
|
|
|
2013-10-22 13:19:56 +02:00
|
|
|
if (isempty(c->locale[p]))
|
2016-05-26 19:46:56 +02:00
|
|
|
l_unset[c_set++] = (char*) name;
|
2011-12-31 06:50:34 +01:00
|
|
|
else {
|
|
|
|
char *s;
|
|
|
|
|
2016-05-26 19:46:56 +02:00
|
|
|
if (asprintf(&s, "%s=%s", name, c->locale[p]) < 0)
|
2013-10-22 13:19:56 +02:00
|
|
|
return -ENOMEM;
|
2011-12-31 06:50:34 +01:00
|
|
|
|
|
|
|
l_set[c_unset++] = s;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-05-26 19:46:56 +02:00
|
|
|
assert(c_set + c_unset == _VARIABLE_LC_MAX);
|
2014-02-19 23:54:58 +01:00
|
|
|
r = sd_bus_message_new_method_call(bus, &m,
|
2013-10-22 13:19:56 +02:00
|
|
|
"org.freedesktop.systemd1",
|
|
|
|
"/org/freedesktop/systemd1",
|
|
|
|
"org.freedesktop.systemd1.Manager",
|
2014-02-19 23:54:58 +01:00
|
|
|
"UnsetAndSetEnvironment");
|
2013-10-22 13:19:56 +02:00
|
|
|
if (r < 0)
|
|
|
|
return r;
|
2011-12-31 06:50:34 +01:00
|
|
|
|
2013-10-22 13:19:56 +02:00
|
|
|
r = sd_bus_message_append_strv(m, l_unset);
|
|
|
|
if (r < 0)
|
|
|
|
return r;
|
2011-12-31 06:50:34 +01:00
|
|
|
|
2013-10-22 13:19:56 +02:00
|
|
|
r = sd_bus_message_append_strv(m, l_set);
|
|
|
|
if (r < 0)
|
|
|
|
return r;
|
2011-12-31 06:50:34 +01:00
|
|
|
|
2013-11-11 18:55:34 +01:00
|
|
|
r = sd_bus_call(bus, m, 0, &error, NULL);
|
2013-10-22 13:19:56 +02:00
|
|
|
if (r < 0)
|
2014-11-28 13:19:16 +01:00
|
|
|
log_error_errno(r, "Failed to update the manager environment: %m");
|
2011-12-31 06:50:34 +01:00
|
|
|
|
2013-10-22 13:19:56 +02:00
|
|
|
return 0;
|
2011-12-31 06:50:34 +01:00
|
|
|
}
|
|
|
|
|
2013-10-22 13:19:56 +02:00
|
|
|
static int vconsole_reload(sd_bus *bus) {
|
tree-wide: expose "p"-suffix unref calls in public APIs to make gcc cleanup easy
GLIB has recently started to officially support the gcc cleanup
attribute in its public API, hence let's do the same for our APIs.
With this patch we'll define an xyz_unrefp() call for each public
xyz_unref() call, to make it easy to use inside a
__attribute__((cleanup())) expression. Then, all code is ported over to
make use of this.
The new calls are also documented in the man pages, with examples how to
use them (well, I only added docs where the _unref() call itself already
had docs, and the examples, only cover sd_bus_unrefp() and
sd_event_unrefp()).
This also renames sd_lldp_free() to sd_lldp_unref(), since that's how we
tend to call our destructors these days.
Note that this defines no public macro that wraps gcc's attribute and
makes it easier to use. While I think it's our duty in the library to
make our stuff easy to use, I figure it's not our duty to make gcc's own
features easy to use on its own. Most likely, client code which wants to
make use of this should define its own:
#define _cleanup_(function) __attribute__((cleanup(function)))
Or similar, to make the gcc feature easier to use.
Making this logic public has the benefit that we can remove three header
files whose only purpose was to define these functions internally.
See #2008.
2015-11-27 19:13:45 +01:00
|
|
|
_cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
|
2011-12-31 06:50:34 +01:00
|
|
|
int r;
|
|
|
|
|
|
|
|
assert(bus);
|
|
|
|
|
2013-10-22 13:19:56 +02:00
|
|
|
r = sd_bus_call_method(bus,
|
2011-12-31 06:50:34 +01:00
|
|
|
"org.freedesktop.systemd1",
|
|
|
|
"/org/freedesktop/systemd1",
|
|
|
|
"org.freedesktop.systemd1.Manager",
|
2013-10-22 13:19:56 +02:00
|
|
|
"RestartUnit",
|
|
|
|
&error,
|
|
|
|
NULL,
|
|
|
|
"ss", "systemd-vconsole-setup.service", "replace");
|
2011-12-31 06:50:34 +01:00
|
|
|
|
2013-10-22 13:19:56 +02:00
|
|
|
if (r < 0)
|
|
|
|
log_error("Failed to issue method call: %s", bus_error_message(&error, -r));
|
2011-12-31 06:50:34 +01:00
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
2016-05-26 19:35:20 +02:00
|
|
|
static int vconsole_convert_to_x11_and_emit(Context *c, sd_bus *bus) {
|
localed: check for partially matching converted keymaps
If a user specifies multiple X11 keymaps, with a (at least the first
one) nonempty variant, and we don't match the whole combo, use
a converted keymap which includes the variant in preference to
the default, variantless, keymap.
E.g.: We would convert X11 config "layout=fr variant=mac" to "fr-mac",
but "layout=fr,us variant=mac," to "fr", because we don't have a
converted keymap which would match "fr,us", and we don't have a legacy
mapping for "fr,us". This is unexpected, and if we cannot match both,
it is still better to match the primary mapping and use "fr-mac".
2014-09-04 04:55:54 +02:00
|
|
|
int r;
|
2013-11-18 19:42:57 +01:00
|
|
|
|
2016-05-26 19:35:20 +02:00
|
|
|
assert(bus);
|
2015-01-31 20:11:23 +01:00
|
|
|
|
2016-05-26 19:35:20 +02:00
|
|
|
r = vconsole_convert_to_x11(c);
|
|
|
|
if (r <= 0)
|
|
|
|
return r;
|
2015-01-31 20:11:23 +01:00
|
|
|
|
2016-05-26 19:35:20 +02:00
|
|
|
/* modified */
|
|
|
|
r = x11_write_data(c);
|
|
|
|
if (r < 0)
|
|
|
|
return log_error_errno(r, "Failed to write X11 keyboard layout: %m");
|
2015-01-31 20:11:23 +01:00
|
|
|
|
2016-05-26 19:35:20 +02:00
|
|
|
sd_bus_emit_properties_changed(bus,
|
|
|
|
"/org/freedesktop/locale1",
|
|
|
|
"org.freedesktop.locale1",
|
|
|
|
"X11Layout", "X11Model", "X11Variant", "X11Options", NULL);
|
2015-01-31 20:11:23 +01:00
|
|
|
|
2016-05-26 19:35:20 +02:00
|
|
|
return 1;
|
2015-01-31 20:11:23 +01:00
|
|
|
}
|
|
|
|
|
2016-05-26 19:35:20 +02:00
|
|
|
static int x11_convert_to_vconsole_and_emit(Context *c, sd_bus *bus) {
|
2013-11-18 19:42:57 +01:00
|
|
|
int r;
|
2011-12-31 06:50:34 +01:00
|
|
|
|
2013-10-22 13:19:56 +02:00
|
|
|
assert(bus);
|
2011-12-31 06:50:34 +01:00
|
|
|
|
2016-05-26 19:35:20 +02:00
|
|
|
r = x11_convert_to_vconsole(c);
|
|
|
|
if (r <= 0)
|
|
|
|
return r;
|
2014-09-04 04:55:16 +02:00
|
|
|
|
2016-05-26 19:35:20 +02:00
|
|
|
/* modified */
|
|
|
|
r = vconsole_write_data(c);
|
|
|
|
if (r < 0)
|
|
|
|
log_error_errno(r, "Failed to save virtual console keymap: %m");
|
2011-12-31 06:50:34 +01:00
|
|
|
|
2016-05-26 19:35:20 +02:00
|
|
|
sd_bus_emit_properties_changed(bus,
|
|
|
|
"/org/freedesktop/locale1",
|
|
|
|
"org.freedesktop.locale1",
|
|
|
|
"VConsoleKeymap", "VConsoleKeymapToggle", NULL);
|
2011-12-31 06:50:34 +01:00
|
|
|
|
2016-05-26 19:35:20 +02:00
|
|
|
return vconsole_reload(bus);
|
2011-12-31 06:50:34 +01:00
|
|
|
}
|
|
|
|
|
2013-11-21 19:34:37 +01:00
|
|
|
static int property_get_locale(
|
|
|
|
sd_bus *bus,
|
|
|
|
const char *path,
|
|
|
|
const char *interface,
|
|
|
|
const char *property,
|
|
|
|
sd_bus_message *reply,
|
|
|
|
void *userdata,
|
|
|
|
sd_bus_error *error) {
|
|
|
|
|
2013-10-22 13:19:56 +02:00
|
|
|
Context *c = userdata;
|
2013-10-12 18:15:49 +02:00
|
|
|
_cleanup_strv_free_ char **l = NULL;
|
2013-10-22 13:19:56 +02:00
|
|
|
int p, q;
|
2011-12-31 06:50:34 +01:00
|
|
|
|
2016-05-26 19:46:56 +02:00
|
|
|
l = new0(char*, _VARIABLE_LC_MAX+1);
|
2011-12-31 06:50:34 +01:00
|
|
|
if (!l)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
2016-05-26 19:46:56 +02:00
|
|
|
for (p = 0, q = 0; p < _VARIABLE_LC_MAX; p++) {
|
2011-12-31 06:50:34 +01:00
|
|
|
char *t;
|
2016-05-26 19:46:56 +02:00
|
|
|
const char *name;
|
|
|
|
|
|
|
|
name = locale_variable_to_string(p);
|
|
|
|
assert(name);
|
2011-12-31 06:50:34 +01:00
|
|
|
|
2013-10-22 13:19:56 +02:00
|
|
|
if (isempty(c->locale[p]))
|
2011-12-31 06:50:34 +01:00
|
|
|
continue;
|
|
|
|
|
2016-05-26 19:46:56 +02:00
|
|
|
if (asprintf(&t, "%s=%s", name, c->locale[p]) < 0)
|
2011-12-31 06:50:34 +01:00
|
|
|
return -ENOMEM;
|
|
|
|
|
2013-10-22 13:19:56 +02:00
|
|
|
l[q++] = t;
|
2011-12-31 06:50:34 +01:00
|
|
|
}
|
|
|
|
|
2013-10-22 13:19:56 +02:00
|
|
|
return sd_bus_message_append_strv(reply, l);
|
2011-12-31 06:50:34 +01:00
|
|
|
}
|
|
|
|
|
2015-04-29 18:35:10 +02:00
|
|
|
static int method_set_locale(sd_bus_message *m, void *userdata, sd_bus_error *error) {
|
2013-10-22 13:19:56 +02:00
|
|
|
Context *c = userdata;
|
|
|
|
_cleanup_strv_free_ char **l = NULL;
|
|
|
|
char **i;
|
2015-01-31 20:11:23 +01:00
|
|
|
const char *lang = NULL;
|
2013-10-22 13:19:56 +02:00
|
|
|
int interactive;
|
|
|
|
bool modified = false;
|
2016-05-26 19:46:56 +02:00
|
|
|
bool have[_VARIABLE_LC_MAX] = {};
|
2013-10-22 13:19:56 +02:00
|
|
|
int p;
|
2011-12-31 06:50:34 +01:00
|
|
|
int r;
|
|
|
|
|
2015-04-29 18:35:10 +02:00
|
|
|
assert(m);
|
|
|
|
assert(c);
|
|
|
|
|
2013-10-22 13:19:56 +02:00
|
|
|
r = bus_message_read_strv_extend(m, &l);
|
|
|
|
if (r < 0)
|
2013-11-21 19:34:37 +01:00
|
|
|
return r;
|
2011-12-31 06:50:34 +01:00
|
|
|
|
2013-10-22 13:19:56 +02:00
|
|
|
r = sd_bus_message_read_basic(m, 'b', &interactive);
|
|
|
|
if (r < 0)
|
2013-11-21 19:34:37 +01:00
|
|
|
return r;
|
2011-12-31 06:50:34 +01:00
|
|
|
|
2014-09-04 04:55:16 +02:00
|
|
|
/* Check whether a variable changed and if it is valid */
|
2013-10-22 13:19:56 +02:00
|
|
|
STRV_FOREACH(i, l) {
|
|
|
|
bool valid = false;
|
2011-12-31 06:50:34 +01:00
|
|
|
|
2016-05-26 19:46:56 +02:00
|
|
|
for (p = 0; p < _VARIABLE_LC_MAX; p++) {
|
2013-10-22 13:19:56 +02:00
|
|
|
size_t k;
|
2016-05-26 19:46:56 +02:00
|
|
|
const char *name;
|
2011-12-31 06:50:34 +01:00
|
|
|
|
2016-05-26 19:46:56 +02:00
|
|
|
name = locale_variable_to_string(p);
|
|
|
|
assert(name);
|
|
|
|
|
|
|
|
k = strlen(name);
|
|
|
|
if (startswith(*i, name) &&
|
2013-10-22 13:19:56 +02:00
|
|
|
(*i)[k] == '=' &&
|
2014-07-07 11:49:48 +02:00
|
|
|
locale_is_valid((*i) + k + 1)) {
|
2013-10-22 13:19:56 +02:00
|
|
|
valid = true;
|
2015-01-31 20:11:23 +01:00
|
|
|
have[p] = true;
|
|
|
|
|
2016-05-26 19:46:56 +02:00
|
|
|
if (p == VARIABLE_LANG)
|
2015-01-31 20:11:23 +01:00
|
|
|
lang = (*i) + k + 1;
|
2011-12-31 06:50:34 +01:00
|
|
|
|
2013-10-22 13:19:56 +02:00
|
|
|
if (!streq_ptr(*i + k + 1, c->locale[p]))
|
|
|
|
modified = true;
|
2011-12-31 06:50:34 +01:00
|
|
|
|
2013-10-22 13:19:56 +02:00
|
|
|
break;
|
|
|
|
}
|
2011-12-31 06:50:34 +01:00
|
|
|
}
|
|
|
|
|
2013-10-22 13:19:56 +02:00
|
|
|
if (!valid)
|
2013-11-21 19:34:37 +01:00
|
|
|
return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid Locale data.");
|
2013-10-22 13:19:56 +02:00
|
|
|
}
|
2011-12-31 06:50:34 +01:00
|
|
|
|
2015-01-31 20:11:23 +01:00
|
|
|
/* If LANG was specified, but not LANGUAGE, check if we should
|
|
|
|
* set it based on the language fallback table. */
|
2016-05-26 19:46:56 +02:00
|
|
|
if (have[VARIABLE_LANG] && !have[VARIABLE_LANGUAGE]) {
|
2015-01-31 20:11:23 +01:00
|
|
|
_cleanup_free_ char *language = NULL;
|
|
|
|
|
|
|
|
assert(lang);
|
|
|
|
|
|
|
|
(void) find_language_fallback(lang, &language);
|
|
|
|
if (language) {
|
|
|
|
log_debug("Converted LANG=%s to LANGUAGE=%s", lang, language);
|
2016-05-26 19:46:56 +02:00
|
|
|
if (!streq_ptr(language, c->locale[VARIABLE_LANGUAGE])) {
|
2015-01-31 20:11:23 +01:00
|
|
|
r = strv_extendf(&l, "LANGUAGE=%s", language);
|
|
|
|
if (r < 0)
|
|
|
|
return r;
|
|
|
|
|
2016-05-26 19:46:56 +02:00
|
|
|
have[VARIABLE_LANGUAGE] = true;
|
2015-01-31 20:11:23 +01:00
|
|
|
modified = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-10-22 13:19:56 +02:00
|
|
|
/* Check whether a variable is unset */
|
2014-09-03 16:28:24 +02:00
|
|
|
if (!modified)
|
2016-05-26 19:46:56 +02:00
|
|
|
for (p = 0; p < _VARIABLE_LC_MAX; p++)
|
2015-01-31 20:11:23 +01:00
|
|
|
if (!isempty(c->locale[p]) && !have[p]) {
|
2013-10-22 13:19:56 +02:00
|
|
|
modified = true;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (modified) {
|
2014-09-04 04:55:16 +02:00
|
|
|
_cleanup_strv_free_ char **settings = NULL;
|
|
|
|
|
2015-02-18 12:55:25 +01:00
|
|
|
r = bus_verify_polkit_async(
|
|
|
|
m,
|
|
|
|
CAP_SYS_ADMIN,
|
|
|
|
"org.freedesktop.locale1.set-locale",
|
2015-09-05 16:07:16 +02:00
|
|
|
NULL,
|
2015-02-18 12:55:25 +01:00
|
|
|
interactive,
|
|
|
|
UID_INVALID,
|
2016-05-26 19:35:20 +02:00
|
|
|
&polkit_registry,
|
2015-02-18 12:55:25 +01:00
|
|
|
error);
|
2013-10-22 13:19:56 +02:00
|
|
|
if (r < 0)
|
2013-11-21 19:34:37 +01:00
|
|
|
return r;
|
2013-10-22 13:19:56 +02:00
|
|
|
if (r == 0)
|
|
|
|
return 1; /* No authorization for now, but the async polkit stuff will call us again when it has it */
|
2011-12-31 06:50:34 +01:00
|
|
|
|
2014-09-03 16:28:24 +02:00
|
|
|
STRV_FOREACH(i, l)
|
2016-05-26 19:46:56 +02:00
|
|
|
for (p = 0; p < _VARIABLE_LC_MAX; p++) {
|
2011-12-31 06:50:34 +01:00
|
|
|
size_t k;
|
2016-05-26 19:46:56 +02:00
|
|
|
const char *name;
|
|
|
|
|
|
|
|
name = locale_variable_to_string(p);
|
|
|
|
assert(name);
|
2011-12-31 06:50:34 +01:00
|
|
|
|
2016-05-26 19:46:56 +02:00
|
|
|
k = strlen(name);
|
|
|
|
if (startswith(*i, name) && (*i)[k] == '=') {
|
2014-09-04 04:53:23 +02:00
|
|
|
r = free_and_strdup(&c->locale[p], *i + k + 1);
|
|
|
|
if (r < 0)
|
|
|
|
return r;
|
2011-12-31 06:50:34 +01:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-05-26 19:46:56 +02:00
|
|
|
for (p = 0; p < _VARIABLE_LC_MAX; p++) {
|
2015-01-31 20:11:23 +01:00
|
|
|
if (have[p])
|
2013-10-22 13:19:56 +02:00
|
|
|
continue;
|
2011-12-31 06:50:34 +01:00
|
|
|
|
2015-09-09 15:15:14 +02:00
|
|
|
c->locale[p] = mfree(c->locale[p]);
|
2013-10-22 13:19:56 +02:00
|
|
|
}
|
2011-12-31 06:50:34 +01:00
|
|
|
|
2013-10-22 13:19:56 +02:00
|
|
|
locale_simplify(c);
|
2011-12-31 06:50:34 +01:00
|
|
|
|
2014-09-04 04:55:16 +02:00
|
|
|
r = locale_write_data(c, &settings);
|
2013-10-22 13:19:56 +02:00
|
|
|
if (r < 0) {
|
2014-11-28 13:19:16 +01:00
|
|
|
log_error_errno(r, "Failed to set locale: %m");
|
2013-11-21 19:34:37 +01:00
|
|
|
return sd_bus_error_set_errnof(error, r, "Failed to set locale: %s", strerror(-r));
|
2013-10-22 13:19:56 +02:00
|
|
|
}
|
2011-12-31 06:50:34 +01:00
|
|
|
|
2015-04-29 18:35:10 +02:00
|
|
|
locale_update_system_manager(c, sd_bus_message_get_bus(m));
|
2011-12-31 06:50:34 +01:00
|
|
|
|
2014-09-04 04:55:16 +02:00
|
|
|
if (settings) {
|
|
|
|
_cleanup_free_ char *line;
|
|
|
|
|
|
|
|
line = strv_join(settings, ", ");
|
|
|
|
log_info("Changed locale to %s.", strnull(line));
|
|
|
|
} else
|
|
|
|
log_info("Changed locale to unset.");
|
2011-12-31 06:50:34 +01:00
|
|
|
|
2015-04-29 18:35:10 +02:00
|
|
|
(void) sd_bus_emit_properties_changed(
|
|
|
|
sd_bus_message_get_bus(m),
|
2013-10-22 13:19:56 +02:00
|
|
|
"/org/freedesktop/locale1",
|
|
|
|
"org.freedesktop.locale1",
|
|
|
|
"Locale", NULL);
|
2014-09-04 04:55:16 +02:00
|
|
|
} else
|
|
|
|
log_debug("Locale settings were not modified.");
|
|
|
|
|
2011-12-31 06:50:34 +01:00
|
|
|
|
2013-11-21 01:51:16 +01:00
|
|
|
return sd_bus_reply_method_return(m, NULL);
|
2013-10-22 13:19:56 +02:00
|
|
|
}
|
2011-12-31 06:50:34 +01:00
|
|
|
|
2015-04-29 18:35:10 +02:00
|
|
|
static int method_set_vc_keyboard(sd_bus_message *m, void *userdata, sd_bus_error *error) {
|
2013-10-22 13:19:56 +02:00
|
|
|
Context *c = userdata;
|
|
|
|
const char *keymap, *keymap_toggle;
|
2013-11-07 02:03:10 +01:00
|
|
|
int convert, interactive;
|
2013-10-22 13:19:56 +02:00
|
|
|
int r;
|
2012-09-21 15:00:43 +02:00
|
|
|
|
2015-04-29 18:35:10 +02:00
|
|
|
assert(m);
|
|
|
|
assert(c);
|
|
|
|
|
2013-10-22 13:19:56 +02:00
|
|
|
r = sd_bus_message_read(m, "ssbb", &keymap, &keymap_toggle, &convert, &interactive);
|
|
|
|
if (r < 0)
|
2013-11-21 19:34:37 +01:00
|
|
|
return r;
|
2011-12-31 06:50:34 +01:00
|
|
|
|
2016-05-30 17:59:43 +02:00
|
|
|
keymap = empty_to_null(keymap);
|
|
|
|
keymap_toggle = empty_to_null(keymap_toggle);
|
2011-12-31 06:50:34 +01:00
|
|
|
|
2013-10-22 13:19:56 +02:00
|
|
|
if (!streq_ptr(keymap, c->vc_keymap) ||
|
|
|
|
!streq_ptr(keymap_toggle, c->vc_keymap_toggle)) {
|
2011-12-31 06:50:34 +01:00
|
|
|
|
2014-12-12 02:32:33 +01:00
|
|
|
if ((keymap && (!filename_is_valid(keymap) || !string_is_safe(keymap))) ||
|
|
|
|
(keymap_toggle && (!filename_is_valid(keymap_toggle) || !string_is_safe(keymap_toggle))))
|
2013-12-28 15:05:45 +01:00
|
|
|
return sd_bus_error_set_errnof(error, -EINVAL, "Received invalid keymap data");
|
2011-12-31 06:50:34 +01:00
|
|
|
|
2015-02-18 12:55:25 +01:00
|
|
|
r = bus_verify_polkit_async(
|
|
|
|
m,
|
|
|
|
CAP_SYS_ADMIN,
|
|
|
|
"org.freedesktop.locale1.set-keyboard",
|
2015-09-05 16:07:16 +02:00
|
|
|
NULL,
|
2015-02-18 12:55:25 +01:00
|
|
|
interactive,
|
|
|
|
UID_INVALID,
|
2016-05-26 19:35:20 +02:00
|
|
|
&polkit_registry,
|
2015-02-18 12:55:25 +01:00
|
|
|
error);
|
2013-10-22 13:19:56 +02:00
|
|
|
if (r < 0)
|
2013-11-21 19:34:37 +01:00
|
|
|
return r;
|
2013-10-22 13:19:56 +02:00
|
|
|
if (r == 0)
|
|
|
|
return 1; /* No authorization for now, but the async polkit stuff will call us again when it has it */
|
2011-12-31 06:50:34 +01:00
|
|
|
|
2014-09-04 04:53:23 +02:00
|
|
|
if (free_and_strdup(&c->vc_keymap, keymap) < 0 ||
|
|
|
|
free_and_strdup(&c->vc_keymap_toggle, keymap_toggle) < 0)
|
2013-10-22 13:19:56 +02:00
|
|
|
return -ENOMEM;
|
2012-10-03 19:29:20 +02:00
|
|
|
|
2013-10-22 13:19:56 +02:00
|
|
|
r = vconsole_write_data(c);
|
|
|
|
if (r < 0) {
|
2014-11-28 13:19:16 +01:00
|
|
|
log_error_errno(r, "Failed to set virtual console keymap: %m");
|
2013-11-21 19:34:37 +01:00
|
|
|
return sd_bus_error_set_errnof(error, r, "Failed to set virtual console keymap: %s", strerror(-r));
|
2013-10-22 13:19:56 +02:00
|
|
|
}
|
2011-12-31 06:50:34 +01:00
|
|
|
|
2014-09-04 04:55:16 +02:00
|
|
|
log_info("Changed virtual console keymap to '%s' toggle '%s'",
|
|
|
|
strempty(c->vc_keymap), strempty(c->vc_keymap_toggle));
|
2011-12-31 06:50:34 +01:00
|
|
|
|
2015-04-29 18:35:10 +02:00
|
|
|
r = vconsole_reload(sd_bus_message_get_bus(m));
|
2013-10-22 13:19:56 +02:00
|
|
|
if (r < 0)
|
2014-11-28 13:19:16 +01:00
|
|
|
log_error_errno(r, "Failed to request keymap reload: %m");
|
2011-12-31 06:50:34 +01:00
|
|
|
|
2015-04-29 18:35:10 +02:00
|
|
|
(void) sd_bus_emit_properties_changed(
|
|
|
|
sd_bus_message_get_bus(m),
|
2013-10-22 13:19:56 +02:00
|
|
|
"/org/freedesktop/locale1",
|
|
|
|
"org.freedesktop.locale1",
|
|
|
|
"VConsoleKeymap", "VConsoleKeymapToggle", NULL);
|
2011-12-31 06:50:34 +01:00
|
|
|
|
2013-10-22 13:19:56 +02:00
|
|
|
if (convert) {
|
2016-05-26 19:35:20 +02:00
|
|
|
r = vconsole_convert_to_x11_and_emit(c, sd_bus_message_get_bus(m));
|
2011-12-31 06:50:34 +01:00
|
|
|
if (r < 0)
|
2014-11-28 13:19:16 +01:00
|
|
|
log_error_errno(r, "Failed to convert keymap data: %m");
|
2011-12-31 06:50:34 +01:00
|
|
|
}
|
2013-10-22 13:19:56 +02:00
|
|
|
}
|
2011-12-31 06:50:34 +01:00
|
|
|
|
2013-11-21 01:51:16 +01:00
|
|
|
return sd_bus_reply_method_return(m, NULL);
|
2013-10-22 13:19:56 +02:00
|
|
|
}
|
2011-12-31 06:50:34 +01:00
|
|
|
|
2014-11-24 15:12:42 +01:00
|
|
|
#ifdef HAVE_XKBCOMMON
|
2016-04-06 18:23:37 +02:00
|
|
|
|
2015-08-17 23:22:24 +02:00
|
|
|
_printf_(3, 0)
|
2014-11-24 15:12:42 +01:00
|
|
|
static void log_xkb(struct xkb_context *ctx, enum xkb_log_level lvl, const char *format, va_list args) {
|
2014-12-03 14:56:56 +01:00
|
|
|
const char *fmt;
|
|
|
|
|
2015-02-03 02:05:59 +01:00
|
|
|
fmt = strjoina("libxkbcommon: ", format);
|
2014-12-03 14:56:56 +01:00
|
|
|
log_internalv(LOG_DEBUG, 0, __FILE__, __LINE__, __func__, fmt, args);
|
2014-11-24 15:12:42 +01:00
|
|
|
}
|
|
|
|
|
2016-04-06 18:23:37 +02:00
|
|
|
#define LOAD_SYMBOL(symbol, dl, name) \
|
|
|
|
({ \
|
|
|
|
(symbol) = (typeof(symbol)) dlvsym((dl), (name), "V_0.5.0"); \
|
|
|
|
(symbol) ? 0 : -EOPNOTSUPP; \
|
|
|
|
})
|
|
|
|
|
2014-11-24 15:12:42 +01:00
|
|
|
static int verify_xkb_rmlvo(const char *model, const char *layout, const char *variant, const char *options) {
|
2016-04-06 18:23:37 +02:00
|
|
|
|
|
|
|
/* We dlopen() the library in order to make the dependency soft. The library (and what it pulls in) is huge
|
|
|
|
* after all, hence let's support XKB maps when the library is around, and refuse otherwise. The function
|
|
|
|
* pointers to the shared library are below: */
|
|
|
|
|
|
|
|
struct xkb_context* (*symbol_xkb_context_new)(enum xkb_context_flags flags) = NULL;
|
|
|
|
void (*symbol_xkb_context_unref)(struct xkb_context *context) = NULL;
|
|
|
|
void (*symbol_xkb_context_set_log_fn)(struct xkb_context *context, void (*log_fn)(struct xkb_context *context, enum xkb_log_level level, const char *format, va_list args)) = NULL;
|
|
|
|
struct xkb_keymap* (*symbol_xkb_keymap_new_from_names)(struct xkb_context *context, const struct xkb_rule_names *names, enum xkb_keymap_compile_flags flags) = NULL;
|
|
|
|
void (*symbol_xkb_keymap_unref)(struct xkb_keymap *keymap) = NULL;
|
|
|
|
|
2014-11-24 15:12:42 +01:00
|
|
|
const struct xkb_rule_names rmlvo = {
|
|
|
|
.model = model,
|
|
|
|
.layout = layout,
|
|
|
|
.variant = variant,
|
|
|
|
.options = options,
|
|
|
|
};
|
|
|
|
struct xkb_context *ctx = NULL;
|
|
|
|
struct xkb_keymap *km = NULL;
|
2016-04-06 18:23:37 +02:00
|
|
|
void *dl;
|
2014-11-24 15:12:42 +01:00
|
|
|
int r;
|
|
|
|
|
2016-04-06 18:23:37 +02:00
|
|
|
/* Compile keymap from RMLVO information to check out its validity */
|
|
|
|
|
|
|
|
dl = dlopen("libxkbcommon.so.0", RTLD_LAZY);
|
|
|
|
if (!dl)
|
|
|
|
return -EOPNOTSUPP;
|
|
|
|
|
|
|
|
r = LOAD_SYMBOL(symbol_xkb_context_new, dl, "xkb_context_new");
|
|
|
|
if (r < 0)
|
|
|
|
goto finish;
|
|
|
|
|
|
|
|
r = LOAD_SYMBOL(symbol_xkb_context_unref, dl, "xkb_context_unref");
|
|
|
|
if (r < 0)
|
|
|
|
goto finish;
|
|
|
|
|
|
|
|
r = LOAD_SYMBOL(symbol_xkb_context_set_log_fn, dl, "xkb_context_set_log_fn");
|
|
|
|
if (r < 0)
|
|
|
|
goto finish;
|
2014-11-24 15:12:42 +01:00
|
|
|
|
2016-04-06 18:23:37 +02:00
|
|
|
r = LOAD_SYMBOL(symbol_xkb_keymap_new_from_names, dl, "xkb_keymap_new_from_names");
|
|
|
|
if (r < 0)
|
|
|
|
goto finish;
|
|
|
|
|
|
|
|
r = LOAD_SYMBOL(symbol_xkb_keymap_unref, dl, "xkb_keymap_unref");
|
|
|
|
if (r < 0)
|
|
|
|
goto finish;
|
|
|
|
|
|
|
|
ctx = symbol_xkb_context_new(XKB_CONTEXT_NO_ENVIRONMENT_NAMES);
|
2014-11-24 15:12:42 +01:00
|
|
|
if (!ctx) {
|
|
|
|
r = -ENOMEM;
|
2016-04-06 18:23:37 +02:00
|
|
|
goto finish;
|
2014-11-24 15:12:42 +01:00
|
|
|
}
|
|
|
|
|
2016-04-06 18:23:37 +02:00
|
|
|
symbol_xkb_context_set_log_fn(ctx, log_xkb);
|
2014-11-24 15:12:42 +01:00
|
|
|
|
2016-04-06 18:23:37 +02:00
|
|
|
km = symbol_xkb_keymap_new_from_names(ctx, &rmlvo, XKB_KEYMAP_COMPILE_NO_FLAGS);
|
2014-11-24 15:12:42 +01:00
|
|
|
if (!km) {
|
|
|
|
r = -EINVAL;
|
2016-04-06 18:23:37 +02:00
|
|
|
goto finish;
|
2014-11-24 15:12:42 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
r = 0;
|
|
|
|
|
2016-04-06 18:23:37 +02:00
|
|
|
finish:
|
|
|
|
if (symbol_xkb_keymap_unref && km)
|
|
|
|
symbol_xkb_keymap_unref(km);
|
|
|
|
|
|
|
|
if (symbol_xkb_context_unref && ctx)
|
|
|
|
symbol_xkb_context_unref(ctx);
|
|
|
|
|
|
|
|
(void) dlclose(dl);
|
2014-11-24 15:12:42 +01:00
|
|
|
return r;
|
|
|
|
}
|
2016-04-06 18:23:37 +02:00
|
|
|
|
2014-11-24 15:12:42 +01:00
|
|
|
#else
|
2016-04-06 18:23:37 +02:00
|
|
|
|
2014-11-24 15:12:42 +01:00
|
|
|
static int verify_xkb_rmlvo(const char *model, const char *layout, const char *variant, const char *options) {
|
|
|
|
return 0;
|
|
|
|
}
|
2016-04-06 18:23:37 +02:00
|
|
|
|
2014-11-24 15:12:42 +01:00
|
|
|
#endif
|
|
|
|
|
2015-04-29 18:35:10 +02:00
|
|
|
static int method_set_x11_keyboard(sd_bus_message *m, void *userdata, sd_bus_error *error) {
|
2013-10-22 13:19:56 +02:00
|
|
|
Context *c = userdata;
|
|
|
|
const char *layout, *model, *variant, *options;
|
2013-11-07 02:03:10 +01:00
|
|
|
int convert, interactive;
|
2013-10-22 13:19:56 +02:00
|
|
|
int r;
|
2011-12-31 06:50:34 +01:00
|
|
|
|
2015-04-29 18:35:10 +02:00
|
|
|
assert(m);
|
|
|
|
assert(c);
|
|
|
|
|
2013-10-22 13:19:56 +02:00
|
|
|
r = sd_bus_message_read(m, "ssssbb", &layout, &model, &variant, &options, &convert, &interactive);
|
|
|
|
if (r < 0)
|
2013-11-21 19:34:37 +01:00
|
|
|
return r;
|
2011-12-31 06:50:34 +01:00
|
|
|
|
2016-05-30 17:59:43 +02:00
|
|
|
layout = empty_to_null(layout);
|
|
|
|
model = empty_to_null(model);
|
|
|
|
variant = empty_to_null(variant);
|
|
|
|
options = empty_to_null(options);
|
2011-12-31 06:50:34 +01:00
|
|
|
|
2013-10-22 13:19:56 +02:00
|
|
|
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)) {
|
2011-12-31 06:50:34 +01:00
|
|
|
|
2013-10-22 13:19:56 +02:00
|
|
|
if ((layout && !string_is_safe(layout)) ||
|
|
|
|
(model && !string_is_safe(model)) ||
|
|
|
|
(variant && !string_is_safe(variant)) ||
|
|
|
|
(options && !string_is_safe(options)))
|
2013-12-28 15:05:45 +01:00
|
|
|
return sd_bus_error_set_errnof(error, -EINVAL, "Received invalid keyboard data");
|
2011-12-31 06:50:34 +01:00
|
|
|
|
2015-02-18 12:55:25 +01:00
|
|
|
r = bus_verify_polkit_async(
|
|
|
|
m,
|
|
|
|
CAP_SYS_ADMIN,
|
|
|
|
"org.freedesktop.locale1.set-keyboard",
|
2015-09-05 16:07:16 +02:00
|
|
|
NULL,
|
2015-02-18 12:55:25 +01:00
|
|
|
interactive,
|
|
|
|
UID_INVALID,
|
2016-05-26 19:35:20 +02:00
|
|
|
&polkit_registry,
|
2015-02-18 12:55:25 +01:00
|
|
|
error);
|
2013-10-22 13:19:56 +02:00
|
|
|
if (r < 0)
|
2013-11-21 19:34:37 +01:00
|
|
|
return r;
|
2013-10-22 13:19:56 +02:00
|
|
|
if (r == 0)
|
|
|
|
return 1; /* No authorization for now, but the async polkit stuff will call us again when it has it */
|
|
|
|
|
2014-11-25 10:26:08 +01:00
|
|
|
r = verify_xkb_rmlvo(model, layout, variant, options);
|
2014-12-03 14:56:56 +01:00
|
|
|
if (r < 0) {
|
|
|
|
log_error_errno(r, "Cannot compile XKB keymap for new x11 keyboard layout ('%s' / '%s' / '%s' / '%s'): %m",
|
|
|
|
strempty(model), strempty(layout), strempty(variant), strempty(options));
|
2016-04-06 18:23:37 +02:00
|
|
|
|
|
|
|
if (r == -EOPNOTSUPP)
|
|
|
|
return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED, "Local keyboard configuration not supported on this system.");
|
|
|
|
|
|
|
|
return sd_bus_error_set(error, SD_BUS_ERROR_INVALID_ARGS, "Specified keymap cannot be compiled, refusing as invalid.");
|
2014-12-03 14:56:56 +01:00
|
|
|
}
|
2014-11-25 10:26:08 +01:00
|
|
|
|
2014-09-04 04:53:23 +02:00
|
|
|
if (free_and_strdup(&c->x11_layout, layout) < 0 ||
|
|
|
|
free_and_strdup(&c->x11_model, model) < 0 ||
|
|
|
|
free_and_strdup(&c->x11_variant, variant) < 0 ||
|
|
|
|
free_and_strdup(&c->x11_options, options) < 0)
|
2013-10-22 13:19:56 +02:00
|
|
|
return -ENOMEM;
|
2011-12-31 06:50:34 +01:00
|
|
|
|
2014-09-04 18:30:46 +02:00
|
|
|
r = x11_write_data(c);
|
2013-10-22 13:19:56 +02:00
|
|
|
if (r < 0) {
|
2014-11-28 13:19:16 +01:00
|
|
|
log_error_errno(r, "Failed to set X11 keyboard layout: %m");
|
2013-11-21 19:34:37 +01:00
|
|
|
return sd_bus_error_set_errnof(error, r, "Failed to set X11 keyboard layout: %s", strerror(-r));
|
2011-12-31 06:50:34 +01:00
|
|
|
}
|
|
|
|
|
2014-09-04 04:55:16 +02:00
|
|
|
log_info("Changed X11 keyboard layout to '%s' model '%s' variant '%s' options '%s'",
|
|
|
|
strempty(c->x11_layout),
|
|
|
|
strempty(c->x11_model),
|
|
|
|
strempty(c->x11_variant),
|
|
|
|
strempty(c->x11_options));
|
2011-12-31 06:50:34 +01:00
|
|
|
|
2015-04-29 18:35:10 +02:00
|
|
|
(void) sd_bus_emit_properties_changed(
|
|
|
|
sd_bus_message_get_bus(m),
|
2013-10-22 13:19:56 +02:00
|
|
|
"/org/freedesktop/locale1",
|
|
|
|
"org.freedesktop.locale1",
|
2014-08-28 15:22:26 +02:00
|
|
|
"X11Layout", "X11Model", "X11Variant", "X11Options", NULL);
|
2011-12-31 06:50:34 +01:00
|
|
|
|
2013-10-22 13:19:56 +02:00
|
|
|
if (convert) {
|
2016-05-26 19:35:20 +02:00
|
|
|
r = x11_convert_to_vconsole_and_emit(c, sd_bus_message_get_bus(m));
|
2013-10-22 13:19:56 +02:00
|
|
|
if (r < 0)
|
2014-11-28 13:19:16 +01:00
|
|
|
log_error_errno(r, "Failed to convert keymap data: %m");
|
2013-10-22 13:19:56 +02:00
|
|
|
}
|
2011-12-31 06:50:34 +01:00
|
|
|
}
|
|
|
|
|
2013-11-21 01:51:16 +01:00
|
|
|
return sd_bus_reply_method_return(m, NULL);
|
2011-12-31 06:50:34 +01:00
|
|
|
}
|
|
|
|
|
2013-10-22 13:19:56 +02:00
|
|
|
static const sd_bus_vtable locale_vtable[] = {
|
|
|
|
SD_BUS_VTABLE_START(0),
|
2013-11-05 00:53:46 +01:00
|
|
|
SD_BUS_PROPERTY("Locale", "as", property_get_locale, 0, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
|
|
|
|
SD_BUS_PROPERTY("X11Layout", "s", NULL, offsetof(Context, x11_layout), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
|
|
|
|
SD_BUS_PROPERTY("X11Model", "s", NULL, offsetof(Context, x11_model), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
|
|
|
|
SD_BUS_PROPERTY("X11Variant", "s", NULL, offsetof(Context, x11_variant), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
|
|
|
|
SD_BUS_PROPERTY("X11Options", "s", NULL, offsetof(Context, x11_options), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
|
|
|
|
SD_BUS_PROPERTY("VConsoleKeymap", "s", NULL, offsetof(Context, vc_keymap), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
|
|
|
|
SD_BUS_PROPERTY("VConsoleKeymapToggle", "s", NULL, offsetof(Context, vc_keymap_toggle), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
|
2013-12-10 17:41:39 +01:00
|
|
|
SD_BUS_METHOD("SetLocale", "asb", NULL, method_set_locale, SD_BUS_VTABLE_UNPRIVILEGED),
|
|
|
|
SD_BUS_METHOD("SetVConsoleKeyboard", "ssbb", NULL, method_set_vc_keyboard, SD_BUS_VTABLE_UNPRIVILEGED),
|
|
|
|
SD_BUS_METHOD("SetX11Keyboard", "ssssbb", NULL, method_set_x11_keyboard, SD_BUS_VTABLE_UNPRIVILEGED),
|
2013-10-22 13:19:56 +02:00
|
|
|
SD_BUS_VTABLE_END
|
|
|
|
};
|
|
|
|
|
|
|
|
static int connect_bus(Context *c, sd_event *event, sd_bus **_bus) {
|
tree-wide: expose "p"-suffix unref calls in public APIs to make gcc cleanup easy
GLIB has recently started to officially support the gcc cleanup
attribute in its public API, hence let's do the same for our APIs.
With this patch we'll define an xyz_unrefp() call for each public
xyz_unref() call, to make it easy to use inside a
__attribute__((cleanup())) expression. Then, all code is ported over to
make use of this.
The new calls are also documented in the man pages, with examples how to
use them (well, I only added docs where the _unref() call itself already
had docs, and the examples, only cover sd_bus_unrefp() and
sd_event_unrefp()).
This also renames sd_lldp_free() to sd_lldp_unref(), since that's how we
tend to call our destructors these days.
Note that this defines no public macro that wraps gcc's attribute and
makes it easier to use. While I think it's our duty in the library to
make our stuff easy to use, I figure it's not our duty to make gcc's own
features easy to use on its own. Most likely, client code which wants to
make use of this should define its own:
#define _cleanup_(function) __attribute__((cleanup(function)))
Or similar, to make the gcc feature easier to use.
Making this logic public has the benefit that we can remove three header
files whose only purpose was to define these functions internally.
See #2008.
2015-11-27 19:13:45 +01:00
|
|
|
_cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;
|
2011-12-31 06:50:34 +01:00
|
|
|
int r;
|
|
|
|
|
2013-10-22 13:19:56 +02:00
|
|
|
assert(c);
|
|
|
|
assert(event);
|
2011-12-31 06:50:34 +01:00
|
|
|
assert(_bus);
|
|
|
|
|
2013-11-11 22:00:48 +01:00
|
|
|
r = sd_bus_default_system(&bus);
|
2014-11-28 18:50:43 +01:00
|
|
|
if (r < 0)
|
|
|
|
return log_error_errno(r, "Failed to get system bus connection: %m");
|
2011-12-31 06:50:34 +01:00
|
|
|
|
2014-05-15 01:15:30 +02:00
|
|
|
r = sd_bus_add_object_vtable(bus, NULL, "/org/freedesktop/locale1", "org.freedesktop.locale1", locale_vtable, c);
|
2014-11-28 18:50:43 +01:00
|
|
|
if (r < 0)
|
|
|
|
return log_error_errno(r, "Failed to register object: %m");
|
2011-12-31 06:50:34 +01:00
|
|
|
|
2013-12-12 20:26:48 +01:00
|
|
|
r = sd_bus_request_name(bus, "org.freedesktop.locale1", 0);
|
2014-11-28 18:50:43 +01:00
|
|
|
if (r < 0)
|
|
|
|
return log_error_errno(r, "Failed to register name: %m");
|
2011-12-31 06:50:34 +01:00
|
|
|
|
2013-10-22 13:19:56 +02:00
|
|
|
r = sd_bus_attach_event(bus, event, 0);
|
2014-11-28 18:50:43 +01:00
|
|
|
if (r < 0)
|
|
|
|
return log_error_errno(r, "Failed to attach bus to event loop: %m");
|
2011-12-31 06:50:34 +01:00
|
|
|
|
2013-10-22 13:19:56 +02:00
|
|
|
*_bus = bus;
|
|
|
|
bus = NULL;
|
2011-12-31 06:50:34 +01:00
|
|
|
|
2013-10-22 13:19:56 +02:00
|
|
|
return 0;
|
2011-12-31 06:50:34 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
int main(int argc, char *argv[]) {
|
2014-09-03 16:28:24 +02:00
|
|
|
_cleanup_(context_free) Context context = {};
|
tree-wide: expose "p"-suffix unref calls in public APIs to make gcc cleanup easy
GLIB has recently started to officially support the gcc cleanup
attribute in its public API, hence let's do the same for our APIs.
With this patch we'll define an xyz_unrefp() call for each public
xyz_unref() call, to make it easy to use inside a
__attribute__((cleanup())) expression. Then, all code is ported over to
make use of this.
The new calls are also documented in the man pages, with examples how to
use them (well, I only added docs where the _unref() call itself already
had docs, and the examples, only cover sd_bus_unrefp() and
sd_event_unrefp()).
This also renames sd_lldp_free() to sd_lldp_unref(), since that's how we
tend to call our destructors these days.
Note that this defines no public macro that wraps gcc's attribute and
makes it easier to use. While I think it's our duty in the library to
make our stuff easy to use, I figure it's not our duty to make gcc's own
features easy to use on its own. Most likely, client code which wants to
make use of this should define its own:
#define _cleanup_(function) __attribute__((cleanup(function)))
Or similar, to make the gcc feature easier to use.
Making this logic public has the benefit that we can remove three header
files whose only purpose was to define these functions internally.
See #2008.
2015-11-27 19:13:45 +01:00
|
|
|
_cleanup_(sd_event_unrefp) sd_event *event = NULL;
|
|
|
|
_cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;
|
2011-12-31 06:50:34 +01:00
|
|
|
int r;
|
|
|
|
|
|
|
|
log_set_target(LOG_TARGET_AUTO);
|
|
|
|
log_parse_environment();
|
|
|
|
log_open();
|
2013-10-22 13:19:56 +02:00
|
|
|
|
2011-12-31 06:50:34 +01:00
|
|
|
umask(0022);
|
2016-03-02 02:35:55 +01:00
|
|
|
mac_selinux_init();
|
2011-12-31 06:50:34 +01:00
|
|
|
|
|
|
|
if (argc != 1) {
|
|
|
|
log_error("This program takes no arguments.");
|
|
|
|
r = -EINVAL;
|
|
|
|
goto finish;
|
|
|
|
}
|
|
|
|
|
2013-11-11 19:34:13 +01:00
|
|
|
r = sd_event_default(&event);
|
2011-12-31 06:50:34 +01:00
|
|
|
if (r < 0) {
|
2014-11-28 13:19:16 +01:00
|
|
|
log_error_errno(r, "Failed to allocate event loop: %m");
|
2011-12-31 06:50:34 +01:00
|
|
|
goto finish;
|
|
|
|
}
|
|
|
|
|
2013-12-11 18:14:52 +01:00
|
|
|
sd_event_set_watchdog(event, true);
|
|
|
|
|
2013-10-22 13:19:56 +02:00
|
|
|
r = connect_bus(&context, event, &bus);
|
2011-12-31 06:50:34 +01:00
|
|
|
if (r < 0)
|
|
|
|
goto finish;
|
|
|
|
|
2013-10-22 13:19:56 +02:00
|
|
|
r = context_read_data(&context);
|
|
|
|
if (r < 0) {
|
2014-11-28 13:19:16 +01:00
|
|
|
log_error_errno(r, "Failed to read locale data: %m");
|
2013-10-22 13:19:56 +02:00
|
|
|
goto finish;
|
|
|
|
}
|
2011-12-31 06:50:34 +01:00
|
|
|
|
2013-12-19 21:14:52 +01:00
|
|
|
r = bus_event_loop_with_idle(event, bus, "org.freedesktop.locale1", DEFAULT_EXIT_USEC, NULL, NULL);
|
2016-05-26 19:35:20 +02:00
|
|
|
if (r < 0)
|
2014-11-28 13:19:16 +01:00
|
|
|
log_error_errno(r, "Failed to run event loop: %m");
|
2011-12-31 06:50:34 +01:00
|
|
|
|
|
|
|
finish:
|
2016-05-26 19:35:20 +02:00
|
|
|
bus_verify_polkit_async_registry_free(polkit_registry);
|
|
|
|
|
2011-12-31 06:50:34 +01:00
|
|
|
return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
|
|
|
|
}
|