chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f0511bd
)
bus: TIMESTAMP is optional kdbus metadata now, NAMES are always added
author
Kay Sievers
<kay@vrfy.org>
Mon, 18 Nov 2013 00:30:57 +0000
(
01:30
+0100)
committer
Kay Sievers
<kay@vrfy.org>
Mon, 18 Nov 2013 00:30:57 +0000
(
01:30
+0100)
src/libsystemd-bus/kdbus.h
patch
|
blob
|
history
src/libsystemd-bus/libsystemd-bus.sym
patch
|
blob
|
history
src/libsystemd-bus/sd-bus.c
patch
|
blob
|
history
src/libsystemd-bus/test-bus-kernel.c
patch
|
blob
|
history
src/systemd/sd-bus.h
patch
|
blob
|
history
diff --git
a/src/libsystemd-bus/kdbus.h
b/src/libsystemd-bus/kdbus.h
index fadb2f2f0c871438008633b8a91c9fe2de602cf5..6e21b7242a694815afbae703a718c2ba1bd7b980 100644
(file)
--- 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_ACCEPT_FD = 1 << 1,
/* subscription for metadata to attach */
- KDBUS_HELLO_ATTACH_
CREDS
= 1 << 8,
- KDBUS_HELLO_ATTACH_
NAME
S = 1 << 9,
+ KDBUS_HELLO_ATTACH_
TIMESTAMP
= 1 << 8,
+ KDBUS_HELLO_ATTACH_
CRED
S = 1 << 9,
KDBUS_HELLO_ATTACH_COMM = 1 << 10,
KDBUS_HELLO_ATTACH_EXE = 1 << 11,
KDBUS_HELLO_ATTACH_CMDLINE = 1 << 12,
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 03353f1875058c1bb0cec7820eafbb671062988f..a1ffc439c1fe72dd31c9413ddb701afe39fb2387 100644
(file)
--- 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_set_server;
sd_bus_set_anonymous;
sd_bus_negotiate_fds;
+ sd_bus_negotiate_attach_timestamp;
sd_bus_negotiate_attach_creds;
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;
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 2345c734c3a4afc00e0e2907f2a0cc3a5cc06d02..d93138bb152bb7d9ca610d3433292b73596978a5 100644
(file)
--- 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;
}
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);
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;
}
return 0;
}
-_public_ int sd_bus_negotiate_attach_
name
s(sd_bus *bus, int b) {
+_public_ int sd_bus_negotiate_attach_
cred
s(sd_bus *bus, int b) {
assert_return(bus, -EINVAL);
assert_return(bus->state == BUS_UNSET, -EPERM);
assert_return(!bus_pid_changed(bus), -ECHILD);
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_
NAME
S, b);
+ SET_FLAG(bus->hello_flags, KDBUS_HELLO_ATTACH_
CRED
S, b);
return 0;
}
return 0;
}
diff --git
a/src/libsystemd-bus/test-bus-kernel.c
b/src/libsystemd-bus/test-bus-kernel.c
index 05045028b08aff3878b334783704f746292289a9..44d2fa7247fa1b9f6df8934dffaec9ae19dc3f64 100644
(file)
--- 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);
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_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);
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_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_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);
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);
diff --git
a/src/systemd/sd-bus.h
b/src/systemd/sd-bus.h
index cff4e539d37b0dfcfffbafad0fa39e8e1bb90bbc..d56f8b3c7546a9f3b93ef84fbd7d565e78fadcbd 100644
(file)
--- a/
src/systemd/sd-bus.h
+++ b/
src/systemd/sd-bus.h
@@
-73,8
+73,8
@@
int sd_bus_set_bus_client(sd_bus *bus, int b);
int sd_bus_set_server(sd_bus *bus, int b, sd_id128_t server_id);
int sd_bus_set_anonymous(sd_bus *bus, int b);
int sd_bus_negotiate_fds(sd_bus *bus, int b);
int sd_bus_set_server(sd_bus *bus, int b, sd_id128_t server_id);
int sd_bus_set_anonymous(sd_bus *bus, int b);
int sd_bus_negotiate_fds(sd_bus *bus, int b);
+int sd_bus_negotiate_attach_timestamp(sd_bus *bus, int b);
int sd_bus_negotiate_attach_creds(sd_bus *bus, int b);
int sd_bus_negotiate_attach_creds(sd_bus *bus, int b);
-int sd_bus_negotiate_attach_names(sd_bus *bus, int b);
int sd_bus_negotiate_attach_comm(sd_bus *bus, int b);
int sd_bus_negotiate_attach_exe(sd_bus *bus, int b);
int sd_bus_negotiate_attach_cmdline(sd_bus *bus, int b);
int sd_bus_negotiate_attach_comm(sd_bus *bus, int b);
int sd_bus_negotiate_attach_exe(sd_bus *bus, int b);
int sd_bus_negotiate_attach_cmdline(sd_bus *bus, int b);