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: when a bus call is done on a session, user or seat, optionally determine...
[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 909007c30c95296588581140cad9e6462b5d6a32..ddf2cd84a7c963e240840b3d00e6ebde60d5f44d 100644
(file)
--- a/
src/login/logind-seat-dbus.c
+++ b/
src/login/logind-seat-dbus.c
@@
-21,12
+21,12
@@
#include <errno.h>
#include <string.h>
#include <errno.h>
#include <string.h>
-#include <sys/capability.h>
#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 "bus-common-errors.h"
+#include "bus-label.h"
#include "logind.h"
#include "logind-seat.h"
#include "logind.h"
#include "logind-seat.h"
@@
-201,7
+201,7
@@
static int method_terminate(sd_bus *bus, sd_bus_message *message, void *userdata
assert(message);
assert(s);
assert(message);
assert(s);
- r = seat_stop_sessions(s);
+ r = seat_stop_sessions(s
, true
);
if (r < 0)
return r;
if (r < 0)
return r;
@@
-326,25
+326,22
@@
int seat_object_find(sd_bus *bus, const char *path, const char *interface, void
_cleanup_bus_creds_unref_ sd_bus_creds *creds = NULL;
sd_bus_message *message;
Session *session;
_cleanup_bus_creds_unref_ sd_bus_creds *creds = NULL;
sd_bus_message *message;
Session *session;
-
pid_t pid
;
+
const char *name
;
- message = sd_bus_get_current(bus);
+ message = sd_bus_get_current
_message
(bus);
if (!message)
return 0;
if (!message)
return 0;
- r = sd_bus_query_sender_creds(message, SD_BUS_CREDS_
PID
, &creds);
+ r = sd_bus_query_sender_creds(message, SD_BUS_CREDS_
SESSION|SD_BUS_CREDS_AUGMENT
, &creds);
if (r < 0)
return r;
if (r < 0)
return r;
- r = sd_bus_creds_get_
pid(creds, &pid
);
+ r = sd_bus_creds_get_
session(creds, &name
);
if (r < 0)
return r;
if (r < 0)
return r;
- r = manager_get_session_by_pid(m, pid, &session);
- if (r <= 0)
- return 0;
-
- if (!session->seat)
+ session = hashmap_get(m->sessions, name);
+ if (!session)
return 0;
seat = session->seat;
return 0;
seat = session->seat;
@@
-356,15
+353,16
@@
int seat_object_find(sd_bus *bus, const char *path, const char *interface, void
if (!p)
return 0;
if (!p)
return 0;
- e =
sd_
bus_label_unescape(p);
+ e = bus_label_unescape(p);
if (!e)
return -ENOMEM;
seat = hashmap_get(m->seats, e);
if (!e)
return -ENOMEM;
seat = hashmap_get(m->seats, e);
- if (!seat)
- return 0;
}
}
+ if (!seat)
+ return 0;
+
*found = seat;
return 1;
}
*found = seat;
return 1;
}
@@
-374,7
+372,7
@@
char *seat_bus_path(Seat *s) {
assert(s);
assert(s);
- t =
sd_
bus_label_escape(s->id);
+ t = bus_label_escape(s->id);
if (!t)
return NULL;
if (!t)
return NULL;
@@
-399,13
+397,15
@@
int seat_node_enumerator(sd_bus *bus, const char *path, void *userdata, char ***
if (!p)
return -ENOMEM;
if (!p)
return -ENOMEM;
- r = strv_push(&l, p);
- if (r < 0) {
- free(p);
+ r = strv_consume(&l, p);
+ if (r < 0)
return r;
return r;
- }
}
}
+ r = strv_extend(&l, "/org/freedesktop/login1/seat/self");
+ if (r < 0)
+ return r;
+
*nodes = l;
l = NULL;
*nodes = l;
l = NULL;