summaryrefslogtreecommitdiff
path: root/src/libsystemd-bus
diff options
context:
space:
mode:
authorKay Sievers <kay@vrfy.org>2013-11-18 01:30:57 +0100
committerKay Sievers <kay@vrfy.org>2013-11-18 01:30:57 +0100
commitf21326e604fd252600f3b99c277b30981477e4b1 (patch)
treee75f9510855faff22364f45ca104a9ba035055c3 /src/libsystemd-bus
parentf0511bd7e3d591383485a36ddcb764abe74b1939 (diff)
bus: TIMESTAMP is optional kdbus metadata now, NAMES are always added
Diffstat (limited to 'src/libsystemd-bus')
-rw-r--r--src/libsystemd-bus/kdbus.h4
-rw-r--r--src/libsystemd-bus/libsystemd-bus.sym2
-rw-r--r--src/libsystemd-bus/sd-bus.c8
-rw-r--r--src/libsystemd-bus/test-bus-kernel.c4
4 files changed, 9 insertions, 9 deletions
diff --git a/src/libsystemd-bus/kdbus.h b/src/libsystemd-bus/kdbus.h
index fadb2f2f0c..6e21b7242a 100644
--- a/src/libsystemd-bus/kdbus.h
+++ b/src/libsystemd-bus/kdbus.h
@@ -238,8 +238,8 @@ enum {
KDBUS_HELLO_ACCEPT_FD = 1 << 1,
/* subscription for metadata to attach */
- KDBUS_HELLO_ATTACH_CREDS = 1 << 8,
- KDBUS_HELLO_ATTACH_NAMES = 1 << 9,
+ KDBUS_HELLO_ATTACH_TIMESTAMP = 1 << 8,
+ KDBUS_HELLO_ATTACH_CREDS = 1 << 9,
KDBUS_HELLO_ATTACH_COMM = 1 << 10,
KDBUS_HELLO_ATTACH_EXE = 1 << 11,
KDBUS_HELLO_ATTACH_CMDLINE = 1 << 12,
diff --git a/src/libsystemd-bus/libsystemd-bus.sym b/src/libsystemd-bus/libsystemd-bus.sym
index 03353f1875..a1ffc439c1 100644
--- a/src/libsystemd-bus/libsystemd-bus.sym
+++ b/src/libsystemd-bus/libsystemd-bus.sym
@@ -26,8 +26,8 @@ global:
sd_bus_set_server;
sd_bus_set_anonymous;
sd_bus_negotiate_fds;
+ sd_bus_negotiate_attach_timestamp;
sd_bus_negotiate_attach_creds;
- sd_bus_negotiate_attach_names;
sd_bus_negotiate_attach_comm;
sd_bus_negotiate_attach_exe;
sd_bus_negotiate_attach_cmdline;
diff --git a/src/libsystemd-bus/sd-bus.c b/src/libsystemd-bus/sd-bus.c
index 2345c734c3..d93138bb15 100644
--- a/src/libsystemd-bus/sd-bus.c
+++ b/src/libsystemd-bus/sd-bus.c
@@ -264,21 +264,21 @@ _public_ int sd_bus_negotiate_fds(sd_bus *bus, int b) {
return 0;
}
-_public_ int sd_bus_negotiate_attach_creds(sd_bus *bus, int b) {
+_public_ int sd_bus_negotiate_attach_timestamp(sd_bus *bus, int b) {
assert_return(bus, -EINVAL);
assert_return(bus->state == BUS_UNSET, -EPERM);
assert_return(!bus_pid_changed(bus), -ECHILD);
- SET_FLAG(bus->hello_flags, KDBUS_HELLO_ATTACH_CREDS, b);
+ SET_FLAG(bus->hello_flags, KDBUS_HELLO_ATTACH_TIMESTAMP, b);
return 0;
}
-_public_ int sd_bus_negotiate_attach_names(sd_bus *bus, int b) {
+_public_ int sd_bus_negotiate_attach_creds(sd_bus *bus, int b) {
assert_return(bus, -EINVAL);
assert_return(bus->state == BUS_UNSET, -EPERM);
assert_return(!bus_pid_changed(bus), -ECHILD);
- SET_FLAG(bus->hello_flags, KDBUS_HELLO_ATTACH_NAMES, b);
+ SET_FLAG(bus->hello_flags, KDBUS_HELLO_ATTACH_CREDS, b);
return 0;
}
diff --git a/src/libsystemd-bus/test-bus-kernel.c b/src/libsystemd-bus/test-bus-kernel.c
index 05045028b0..44d2fa7247 100644
--- a/src/libsystemd-bus/test-bus-kernel.c
+++ b/src/libsystemd-bus/test-bus-kernel.c
@@ -62,8 +62,8 @@ int main(int argc, char *argv[]) {
r = sd_bus_set_address(b, address);
assert_se(r >= 0);
+ assert_se(sd_bus_negotiate_attach_timestamp(a, 1) >= 0);
assert_se(sd_bus_negotiate_attach_creds(a, 1) >= 0);
- assert_se(sd_bus_negotiate_attach_names(a, 1) >= 0);
assert_se(sd_bus_negotiate_attach_comm(a, 1) >= 0);
assert_se(sd_bus_negotiate_attach_exe(a, 1) >= 0);
assert_se(sd_bus_negotiate_attach_cmdline(a, 1) >= 0);
@@ -72,8 +72,8 @@ int main(int argc, char *argv[]) {
assert_se(sd_bus_negotiate_attach_selinux_context(a, 1) >= 0);
assert_se(sd_bus_negotiate_attach_audit(a, 1) >= 0);
+ assert_se(sd_bus_negotiate_attach_timestamp(b, 1) >= 0);
assert_se(sd_bus_negotiate_attach_creds(b, 1) >= 0);
- assert_se(sd_bus_negotiate_attach_names(b, 1) >= 0);
assert_se(sd_bus_negotiate_attach_comm(b, 1) >= 0);
assert_se(sd_bus_negotiate_attach_exe(b, 1) >= 0);
assert_se(sd_bus_negotiate_attach_cmdline(b, 1) >= 0);