chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rename basic.la to shared.la and put selinux deps in shared-selinx.la
[elogind.git]
/
src
/
locale
/
localed.c
diff --git
a/src/locale/localed.c
b/src/locale/localed.c
index d46d91e032d5fb05730dcc3eb708bf73fe990299..e6aaa5cab3bb721a6df4ded143ca88b9a6accf11 100644
(file)
--- a/
src/locale/localed.c
+++ b/
src/locale/localed.c
@@
-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"
@@
-1100,7
+1101,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);
@@
-1181,7
+1182,7
@@
static DBusHandlerResult locale_message_handler(
if (!streq_ptr(keymap, state.vc_keymap) ||
!streq_ptr(keymap_toggle, state.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);
@@
-1251,7
+1252,7
@@
static DBusHandlerResult locale_message_handler(
!streq_ptr(variant, state.x11_variant) ||
!streq_ptr(options, state.x11_options)) {
!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);