chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove support for auto-spawning VTs
[elogind.git]
/
src
/
login
/
logind-session-dbus.c
diff --git
a/src/login/logind-session-dbus.c
b/src/login/logind-session-dbus.c
index d51a6e4bb97aa266a7686696c9b571c157b47822..b0db8e2ccb6cdf06e0a844d2d031b32b4bf89dba 100644
(file)
--- a/
src/login/logind-session-dbus.c
+++ b/
src/login/logind-session-dbus.c
@@
-191,6
+191,7
@@
int bus_session_method_terminate(sd_bus_message *message, void *userdata, sd_bus
message,
CAP_KILL,
"org.freedesktop.login1.manage",
message,
CAP_KILL,
"org.freedesktop.login1.manage",
+ NULL,
false,
s->user->uid,
&s->manager->polkit_registry,
false,
s->user->uid,
&s->manager->polkit_registry,
@@
-232,6
+233,7
@@
int bus_session_method_lock(sd_bus_message *message, void *userdata, sd_bus_erro
message,
CAP_SYS_ADMIN,
"org.freedesktop.login1.lock-sessions",
message,
CAP_SYS_ADMIN,
"org.freedesktop.login1.lock-sessions",
+ NULL,
false,
s->user->uid,
&s->manager->polkit_registry,
false,
s->user->uid,
&s->manager->polkit_registry,
@@
-306,6
+308,7
@@
int bus_session_method_kill(sd_bus_message *message, void *userdata, sd_bus_erro
message,
CAP_KILL,
"org.freedesktop.login1.manage",
message,
CAP_KILL,
"org.freedesktop.login1.manage",
+ NULL,
false,
s->user->uid,
&s->manager->polkit_registry,
false,
s->user->uid,
&s->manager->polkit_registry,
@@
-701,6
+704,12
@@
int session_send_create_reply(Session *s, sd_bus_error *error) {
if (!s->create_message)
return 0;
if (!s->create_message)
return 0;
+/// elogind does not support scope and service jobs
+#if 0
+ if (!sd_bus_error_is_set(error) && (s->scope_job || s->user->service_job))
+ return 0;
+#endif // 0
+
c = s->create_message;
s->create_message = NULL;
c = s->create_message;
s->create_message = NULL;
@@
-711,10
+720,9
@@
int session_send_create_reply(Session *s, sd_bus_error *error) {
if (fifo_fd < 0)
return fifo_fd;
if (fifo_fd < 0)
return fifo_fd;
- /* Update the session
and user state files before we notify
- *
the client
about the result. */
+ /* Update the session
state file before we notify the client
+ * about the result. */
session_save(s);
session_save(s);
- user_save(s->user);
p = session_bus_path(s);
if (!p)
p = session_bus_path(s);
if (!p)