chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
logind: fix "CanGraphical" attribute to return correct value
[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 c59dfd93388bc4b9d908cd0210ec20717513bd5d..23f975bca7ebae9c5630644a0b42ca77fccfe54f 100644
(file)
--- a/
src/login/logind-seat-dbus.c
+++ b/
src/login/logind-seat-dbus.c
@@
-25,6
+25,7
@@
#include "util.h"
#include "bus-util.h"
#include "strv.h"
#include "util.h"
#include "bus-util.h"
#include "strv.h"
+#include "bus-errors.h"
#include "logind.h"
#include "logind-seat.h"
#include "logind.h"
#include "logind-seat.h"
@@
-34,8
+35,8
@@
static int property_get_active_session(
const char *interface,
const char *property,
sd_bus_message *reply,
const char *interface,
const char *property,
sd_bus_message *reply,
-
sd_bus_error *error
,
-
void *userdata
) {
+
void *userdata
,
+
sd_bus_error *error
) {
_cleanup_free_ char *p = NULL;
Seat *s = userdata;
_cleanup_free_ char *p = NULL;
Seat *s = userdata;
@@
-57,8
+58,8
@@
static int property_get_can_multi_session(
const char *interface,
const char *property,
sd_bus_message *reply,
const char *interface,
const char *property,
sd_bus_message *reply,
-
sd_bus_error *error
,
-
void *userdata
) {
+
void *userdata
,
+
sd_bus_error *error
) {
Seat *s = userdata;
Seat *s = userdata;
@@
-75,8
+76,8
@@
static int property_get_can_tty(
const char *interface,
const char *property,
sd_bus_message *reply,
const char *interface,
const char *property,
sd_bus_message *reply,
-
sd_bus_error *error
,
-
void *userdata
) {
+
void *userdata
,
+
sd_bus_error *error
) {
Seat *s = userdata;
Seat *s = userdata;
@@
-93,8
+94,8
@@
static int property_get_can_graphical(
const char *interface,
const char *property,
sd_bus_message *reply,
const char *interface,
const char *property,
sd_bus_message *reply,
-
sd_bus_error *error
,
-
void *userdata
) {
+
void *userdata
,
+
sd_bus_error *error
) {
Seat *s = userdata;
Seat *s = userdata;
@@
-102,7
+103,7
@@
static int property_get_can_graphical(
assert(reply);
assert(s);
assert(reply);
assert(s);
- return sd_bus_message_append(reply, "b", seat_can_
tty
(s));
+ return sd_bus_message_append(reply, "b", seat_can_
graphical
(s));
}
static int property_get_sessions(
}
static int property_get_sessions(
@@
-111,8
+112,8
@@
static int property_get_sessions(
const char *interface,
const char *property,
sd_bus_message *reply,
const char *interface,
const char *property,
sd_bus_message *reply,
-
sd_bus_error *error
,
-
void *userdata
) {
+
void *userdata
,
+
sd_bus_error *error
) {
Seat *s = userdata;
Session *session;
Seat *s = userdata;
Session *session;
@@
-152,8
+153,8
@@
static int property_get_idle_hint(
const char *interface,
const char *property,
sd_bus_message *reply,
const char *interface,
const char *property,
sd_bus_message *reply,
-
sd_bus_error *error
,
-
void *userdata
) {
+
void *userdata
,
+
sd_bus_error *error
) {
Seat *s = userdata;
Seat *s = userdata;
@@
-170,8
+171,8
@@
static int property_get_idle_since_hint(
const char *interface,
const char *property,
sd_bus_message *reply,
const char *interface,
const char *property,
sd_bus_message *reply,
-
sd_bus_error *error
,
-
void *userdata
) {
+
void *userdata
,
+
sd_bus_error *error
) {
Seat *s = userdata;
dual_timestamp t;
Seat *s = userdata;
dual_timestamp t;
@@
-191,7
+192,7
@@
static int property_get_idle_since_hint(
return sd_bus_message_append(reply, "t", u);
}
return sd_bus_message_append(reply, "t", u);
}
-static int method_terminate(sd_bus *bus, sd_bus_message *message, void *userdata) {
+static int method_terminate(sd_bus *bus, sd_bus_message *message, void *userdata
, sd_bus_error *error
) {
Seat *s = userdata;
int r;
Seat *s = userdata;
int r;
@@
-201,12
+202,12
@@
static int method_terminate(sd_bus *bus, sd_bus_message *message, void *userdata
r = seat_stop_sessions(s);
if (r < 0)
r = seat_stop_sessions(s);
if (r < 0)
- return
sd_bus_reply_method_errno(bus, message, r, NULL)
;
+ return
r
;
- return sd_bus_reply_method_return(
bus,
message, NULL);
+ return sd_bus_reply_method_return(message, NULL);
}
}
-static int method_activate_session(sd_bus *bus, sd_bus_message *message, void *userdata) {
+static int method_activate_session(sd_bus *bus, sd_bus_message *message, void *userdata
, sd_bus_error *error
) {
Seat *s = userdata;
const char *name;
Session *session;
Seat *s = userdata;
const char *name;
Session *session;
@@
-218,20
+219,20
@@
static int method_activate_session(sd_bus *bus, sd_bus_message *message, void *u
r = sd_bus_message_read(message, "s", &name);
if (r < 0)
r = sd_bus_message_read(message, "s", &name);
if (r < 0)
- return
sd_bus_reply_method_errno(bus, message, r, NULL)
;
+ return
r
;
session = hashmap_get(s->manager->sessions, name);
if (!session)
session = hashmap_get(s->manager->sessions, name);
if (!session)
- return sd_bus_
reply_method_errorf(bus, message
, BUS_ERROR_NO_SUCH_SESSION, "No session '%s' known", name);
+ return sd_bus_
error_setf(error
, BUS_ERROR_NO_SUCH_SESSION, "No session '%s' known", name);
if (session->seat != s)
if (session->seat != s)
- return sd_bus_
reply_method_errorf(bus, message
, BUS_ERROR_SESSION_NOT_ON_SEAT, "Session %s not on seat %s", name, s->id);
+ return sd_bus_
error_setf(error
, BUS_ERROR_SESSION_NOT_ON_SEAT, "Session %s not on seat %s", name, s->id);
r = session_activate(session);
if (r < 0)
r = session_activate(session);
if (r < 0)
- return
sd_bus_reply_method_errno(bus, message, r, NULL)
;
+ return
r
;
- return sd_bus_reply_method_return(
bus,
message, NULL);
+ return sd_bus_reply_method_return(message, NULL);
}
const sd_bus_vtable seat_vtable[] = {
}
const sd_bus_vtable seat_vtable[] = {
@@
-253,7
+254,7
@@
const sd_bus_vtable seat_vtable[] = {
SD_BUS_VTABLE_END
};
SD_BUS_VTABLE_END
};
-int seat_object_find(sd_bus *bus, const char *path, const char *interface, void *
*found, void *userdata
) {
+int seat_object_find(sd_bus *bus, const char *path, const char *interface, void *
userdata, void **found, sd_bus_error *error
) {
Manager *m = userdata;
Seat *seat;
int r;
Manager *m = userdata;
Seat *seat;
int r;
@@
-265,6
+266,7
@@
int seat_object_find(sd_bus *bus, const char *path, const char *interface, void
assert(m);
if (streq(path, "/org/freedesktop/login1/seat/self")) {
assert(m);
if (streq(path, "/org/freedesktop/login1/seat/self")) {
+ _cleanup_bus_creds_unref_ sd_bus_creds *creds = NULL;
sd_bus_message *message;
Session *session;
pid_t pid;
sd_bus_message *message;
Session *session;
pid_t pid;
@@
-273,9
+275,13
@@
int seat_object_find(sd_bus *bus, const char *path, const char *interface, void
if (!message)
return 0;
if (!message)
return 0;
- r = sd_bus_
get_owner_pid(bus, sd_bus_message_get_sender(message), &pid
);
+ r = sd_bus_
query_sender_creds(message, SD_BUS_CREDS_PID, &creds
);
if (r < 0)
if (r < 0)
- return 0;
+ return r;
+
+ r = sd_bus_creds_get_pid(creds, &pid);
+ if (r < 0)
+ return r;
r = manager_get_session_by_pid(m, pid, &session);
if (r <= 0)
r = manager_get_session_by_pid(m, pid, &session);
if (r <= 0)
@@
-293,7
+299,7
@@
int seat_object_find(sd_bus *bus, const char *path, const char *interface, void
if (!p)
return 0;
if (!p)
return 0;
- e =
bus_path
_unescape(p);
+ e =
sd_bus_label
_unescape(p);
if (!e)
return -ENOMEM;
if (!e)
return -ENOMEM;
@@
-311,14
+317,14
@@
char *seat_bus_path(Seat *s) {
assert(s);
assert(s);
- t =
bus_path
_escape(s->id);
+ t =
sd_bus_label
_escape(s->id);
if (!t)
return NULL;
return strappend("/org/freedesktop/login1/seat/", t);
}
if (!t)
return NULL;
return strappend("/org/freedesktop/login1/seat/", t);
}
-int seat_node_enumerator(sd_bus *bus, const char *path,
char ***nodes, void *userdata
) {
+int seat_node_enumerator(sd_bus *bus, const char *path,
void *userdata, char ***nodes, sd_bus_error *error
) {
_cleanup_strv_free_ char **l = NULL;
Manager *m = userdata;
Seat *seat;
_cleanup_strv_free_ char **l = NULL;
Manager *m = userdata;
Seat *seat;