chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #15 from elogind/dev_v229
[elogind.git]
/
src
/
login
/
logind-user-dbus.c
diff --git
a/src/login/logind-user-dbus.c
b/src/login/logind-user-dbus.c
index f7af8ff9b2bd1959d011a8c65560e7943a2786c2..fd98c7becafb800daeb3f7ada0f8d8e06484a8ea 100644
(file)
--- a/
src/login/logind-user-dbus.c
+++ b/
src/login/logind-user-dbus.c
@@
-1,5
+1,3
@@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
/***
This file is part of systemd.
/***
This file is part of systemd.
@@
-22,10
+20,13
@@
#include <errno.h>
#include <string.h>
#include <errno.h>
#include <string.h>
-#include "
strv
.h"
+#include "
alloc-util
.h"
#include "bus-util.h"
#include "bus-util.h"
-#include "
logind
.h"
+#include "
formats-util
.h"
#include "logind-user.h"
#include "logind-user.h"
+#include "logind.h"
+#include "strv.h"
+#include "user-util.h"
static int property_get_display(
sd_bus *bus,
static int property_get_display(
sd_bus *bus,
@@
-102,11
+103,7
@@
static int property_get_sessions(
}
}
- r = sd_bus_message_close_container(reply);
- if (r < 0)
- return r;
-
- return 1;
+ return sd_bus_message_close_container(reply);
}
static int property_get_idle_hint(
}
static int property_get_idle_hint(
@@
-137,7
+134,7
@@
static int property_get_idle_since_hint(
sd_bus_error *error) {
User *u = userdata;
sd_bus_error *error) {
User *u = userdata;
- dual_timestamp t;
+ dual_timestamp t
= DUAL_TIMESTAMP_NULL
;
uint64_t k;
assert(bus);
uint64_t k;
assert(bus);
@@
-171,11
+168,10
@@
static int property_get_linger(
return sd_bus_message_append(reply, "b", r > 0);
}
return sd_bus_message_append(reply, "b", r > 0);
}
-int bus_user_method_terminate(sd_bus
*bus, sd_bus
_message *message, void *userdata, sd_bus_error *error) {
+int bus_user_method_terminate(sd_bus_message *message, void *userdata, sd_bus_error *error) {
User *u = userdata;
int r;
User *u = userdata;
int r;
- assert(bus);
assert(message);
assert(u);
assert(message);
assert(u);
@@
-183,6
+179,7
@@
int bus_user_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,
u->uid,
&u->manager->polkit_registry,
false,
u->uid,
&u->manager->polkit_registry,
@@
-199,12
+196,11
@@
int bus_user_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);
}
-int bus_user_method_kill(sd_bus
*bus, sd_bus
_message *message, void *userdata, sd_bus_error *error) {
+int bus_user_method_kill(sd_bus_message *message, void *userdata, sd_bus_error *error) {
User *u = userdata;
int32_t signo;
int r;
User *u = userdata;
int32_t signo;
int r;
- assert(bus);
assert(message);
assert(u);
assert(message);
assert(u);
@@
-212,6
+208,7
@@
int bus_user_method_kill(sd_bus *bus, sd_bus_message *message, void *userdata, s
message,
CAP_KILL,
"org.freedesktop.login1.manage",
message,
CAP_KILL,
"org.freedesktop.login1.manage",
+ NULL,
false,
u->uid,
&u->manager->polkit_registry,
false,
u->uid,
&u->manager->polkit_registry,
@@
-272,7
+269,7
@@
int user_object_find(sd_bus *bus, const char *path, const char *interface, void
assert(m);
if (streq(path, "/org/freedesktop/login1/user/self")) {
assert(m);
if (streq(path, "/org/freedesktop/login1/user/self")) {
- _cleanup_
bus_creds_unref_
sd_bus_creds *creds = NULL;
+ _cleanup_
(sd_bus_creds_unrefp)
sd_bus_creds *creds = NULL;
sd_bus_message *message;
message = sd_bus_get_current_message(bus);
sd_bus_message *message;
message = sd_bus_get_current_message(bus);
@@
-341,7
+338,7
@@
int user_node_enumerator(sd_bus *bus, const char *path, void *userdata, char ***
message = sd_bus_get_current_message(bus);
if (message) {
message = sd_bus_get_current_message(bus);
if (message) {
- _cleanup_
bus_creds_unref_
sd_bus_creds *creds = NULL;
+ _cleanup_
(sd_bus_creds_unrefp)
sd_bus_creds *creds = NULL;
uid_t uid;
r = sd_bus_query_sender_creds(message, SD_BUS_CREDS_OWNER_UID|SD_BUS_CREDS_AUGMENT, &creds);
uid_t uid;
r = sd_bus_query_sender_creds(message, SD_BUS_CREDS_OWNER_UID|SD_BUS_CREDS_AUGMENT, &creds);