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: remove spurious include of <sys/capability.h>
[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 c3d4d60158f274c3b221086a917989fdc0f9d80b..4e75d5b20964831f0e23fe43954a74ca05b3482b 100644
(file)
--- a/
src/login/logind-session-dbus.c
+++ b/
src/login/logind-session-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 "strv.h"
#include "bus-util.h"
#include "util.h"
#include "strv.h"
#include "bus-util.h"
-#include "bus-errors.h"
+#include "bus-common-errors.h"
+#include "bus-label.h"
#include "logind.h"
#include "logind-session.h"
#include "logind.h"
#include "logind-session.h"
@@
-248,7
+248,7
@@
static int method_set_idle_hint(sd_bus *bus, sd_bus_message *message, void *user
return r;
if (uid != 0 && uid != s->user->uid)
return r;
if (uid != 0 && uid != s->user->uid)
- return sd_bus_error_setf(error, SD_BUS_ERROR_ACCESS_DENIED, "Only owner of session my set idle hint");
+ return sd_bus_error_setf(error, SD_BUS_ERROR_ACCESS_DENIED, "Only owner of session m
a
y set idle hint");
session_set_idle_hint(s, b);
session_set_idle_hint(s, b);
@@
-492,7
+492,7
@@
int session_object_find(sd_bus *bus, const char *path, const char *interface, vo
sd_bus_message *message;
pid_t pid;
sd_bus_message *message;
pid_t pid;
- message = sd_bus_get_current(bus);
+ message = sd_bus_get_current
_message
(bus);
if (!message)
return 0;
if (!message)
return 0;
@@
-515,7
+515,7
@@
int session_object_find(sd_bus *bus, const char *path, const char *interface, vo
if (!p)
return 0;
if (!p)
return 0;
- e =
sd_
bus_label_unescape(p);
+ e = bus_label_unescape(p);
if (!e)
return -ENOMEM;
if (!e)
return -ENOMEM;
@@
-533,7
+533,7
@@
char *session_bus_path(Session *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;