chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: when creating an activating busname attach all metadata fields to the messages...
[elogind.git]
/
src
/
libsystemd
/
sd-bus
/
bus-creds.c
diff --git
a/src/libsystemd/sd-bus/bus-creds.c
b/src/libsystemd/sd-bus/bus-creds.c
index 6143254a60761ad44e7cfd52a1fb1b91d4137af0..3da77cf1d708bbcdf75623c1bd6d906f65aa5e23 100644
(file)
--- a/
src/libsystemd/sd-bus/bus-creds.c
+++ b/
src/libsystemd/sd-bus/bus-creds.c
@@
-30,6
+30,7
@@
#include "time-util.h"
#include "strv.h"
#include "bus-creds.h"
#include "time-util.h"
#include "strv.h"
#include "bus-creds.h"
+#include "bus-label.h"
enum {
CAP_OFFSET_INHERITABLE = 0,
enum {
CAP_OFFSET_INHERITABLE = 0,
@@
-125,7
+126,7
@@
sd_bus_creds* bus_creds_new(void) {
return c;
}
return c;
}
-_public_ int sd_bus_creds_new_from_pid(
pid_t pid, uint64_t mask, sd_bus_creds **ret
) {
+_public_ int sd_bus_creds_new_from_pid(
sd_bus_creds **ret, pid_t pid, uint64_t mask
) {
sd_bus_creds *c;
int r;
sd_bus_creds *c;
int r;
@@
-474,7
+475,7
@@
_public_ int sd_bus_creds_get_connection_name(sd_bus_creds *c, const char **ret)
assert(c->conn_name);
if (!c->unescaped_conn_name) {
assert(c->conn_name);
if (!c->unescaped_conn_name) {
- c->unescaped_conn_name =
sd_
bus_label_unescape(c->conn_name);
+ c->unescaped_conn_name = bus_label_unescape(c->conn_name);
if (!c->unescaped_conn_name)
return -ENOMEM;
}
if (!c->unescaped_conn_name)
return -ENOMEM;
}