chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prep v228: Add remaining updates from upstream (3/3)
[elogind.git]
/
src
/
login
/
logind-seat-dbus.c
diff --git
a/src/login/logind-seat-dbus.c
b/src/login/logind-seat-dbus.c
index f50ee8d759f8a7d0d287d10d7e7b741a77e9607d..43b578f364d447b11ecf0a445fa9ac3bb7091e12 100644
(file)
--- a/
src/login/logind-seat-dbus.c
+++ b/
src/login/logind-seat-dbus.c
@@
-22,13
+22,15
@@
#include <errno.h>
#include <string.h>
#include <errno.h>
#include <string.h>
-#include "util.h"
-#include "bus-util.h"
-#include "strv.h"
+#include "alloc-util.h"
#include "bus-common-errors.h"
#include "bus-label.h"
#include "bus-common-errors.h"
#include "bus-label.h"
-#include "
logind
.h"
+#include "
bus-util
.h"
#include "logind-seat.h"
#include "logind-seat.h"
+#include "logind.h"
+#include "strv.h"
+#include "user-util.h"
+#include "util.h"
static int property_get_active_session(
sd_bus *bus,
static int property_get_active_session(
sd_bus *bus,
@@
-193,11
+195,10
@@
static int property_get_idle_since_hint(
return sd_bus_message_append(reply, "t", u);
}
return sd_bus_message_append(reply, "t", u);
}
-int bus_seat_method_terminate(sd_bus
*bus, sd_bus
_message *message, void *userdata, sd_bus_error *error) {
+int bus_seat_method_terminate(sd_bus_message *message, void *userdata, sd_bus_error *error) {
Seat *s = userdata;
int r;
Seat *s = userdata;
int r;
- assert(bus);
assert(message);
assert(s);
assert(message);
assert(s);
@@
-205,6
+206,7
@@
int bus_seat_method_terminate(sd_bus *bus, sd_bus_message *message, void *userda
message,
CAP_KILL,
"org.freedesktop.login1.manage",
message,
CAP_KILL,
"org.freedesktop.login1.manage",
+ NULL,
false,
UID_INVALID,
&s->manager->polkit_registry,
false,
UID_INVALID,
&s->manager->polkit_registry,
@@
-221,13
+223,12
@@
int bus_seat_method_terminate(sd_bus *bus, sd_bus_message *message, void *userda
return sd_bus_reply_method_return(message, NULL);
}
return sd_bus_reply_method_return(message, NULL);
}
-static int method_activate_session(sd_bus
*bus, sd_bus
_message *message, void *userdata, sd_bus_error *error) {
+static int method_activate_session(sd_bus_message *message, void *userdata, sd_bus_error *error) {
Seat *s = userdata;
const char *name;
Session *session;
int r;
Seat *s = userdata;
const char *name;
Session *session;
int r;
- assert(bus);
assert(message);
assert(s);
assert(message);
assert(s);
@@
-249,12
+250,11
@@
static int method_activate_session(sd_bus *bus, sd_bus_message *message, void *u
return sd_bus_reply_method_return(message, NULL);
}
return sd_bus_reply_method_return(message, NULL);
}
-static int method_switch_to(sd_bus
*bus, sd_bus
_message *message, void *userdata, sd_bus_error *error) {
+static int method_switch_to(sd_bus_message *message, void *userdata, sd_bus_error *error) {
Seat *s = userdata;
unsigned int to;
int r;
Seat *s = userdata;
unsigned int to;
int r;
- assert(bus);
assert(message);
assert(s);
assert(message);
assert(s);
@@
-272,11
+272,10
@@
static int method_switch_to(sd_bus *bus, sd_bus_message *message, void *userdata
return sd_bus_reply_method_return(message, NULL);
}
return sd_bus_reply_method_return(message, NULL);
}
-static int method_switch_to_next(sd_bus
*bus, sd_bus
_message *message, void *userdata, sd_bus_error *error) {
+static int method_switch_to_next(sd_bus_message *message, void *userdata, sd_bus_error *error) {
Seat *s = userdata;
int r;
Seat *s = userdata;
int r;
- assert(bus);
assert(message);
assert(s);
assert(message);
assert(s);
@@
-287,11
+286,10
@@
static int method_switch_to_next(sd_bus *bus, sd_bus_message *message, void *use
return sd_bus_reply_method_return(message, NULL);
}
return sd_bus_reply_method_return(message, NULL);
}
-static int method_switch_to_previous(sd_bus
*bus, sd_bus
_message *message, void *userdata, sd_bus_error *error) {
+static int method_switch_to_previous(sd_bus_message *message, void *userdata, sd_bus_error *error) {
Seat *s = userdata;
int r;
Seat *s = userdata;
int r;
- assert(bus);
assert(message);
assert(s);
assert(message);
assert(s);