summaryrefslogtreecommitdiff
path: root/src/libsystemd/sd-bus/bus-container.c
diff options
context:
space:
mode:
authorDaniel Mack <github@zonque.org>2015-06-10 20:06:43 +0200
committerDaniel Mack <github@zonque.org>2015-06-10 20:06:43 +0200
commita8467435a0c4962cab89574f65e7318ef389351f (patch)
treecea7229033673996d2d492ee29b171ef96096d6e /src/libsystemd/sd-bus/bus-container.c
parent1f8cc1284c586b06ddf2ba5e5d8c9f13f987a1c5 (diff)
parent2a1288ff89322a2f49c79f6d1832c8164c14a05c (diff)
Merge pull request #147 from poettering/cmsg
util: introduce CMSG_FOREACH() macro and make use of it everywhere
Diffstat (limited to 'src/libsystemd/sd-bus/bus-container.c')
-rw-r--r--src/libsystemd/sd-bus/bus-container.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsystemd/sd-bus/bus-container.c b/src/libsystemd/sd-bus/bus-container.c
index f157c25bba..fa7a207448 100644
--- a/src/libsystemd/sd-bus/bus-container.c
+++ b/src/libsystemd/sd-bus/bus-container.c
@@ -222,7 +222,7 @@ int bus_container_connect_kernel(sd_bus *b) {
if (recvmsg(pair[0], &mh, MSG_NOSIGNAL|MSG_CMSG_CLOEXEC) < 0)
return -errno;
- for (cmsg = CMSG_FIRSTHDR(&mh); cmsg; cmsg = CMSG_NXTHDR(&mh, cmsg))
+ CMSG_FOREACH(cmsg, &mh)
if (cmsg->cmsg_level == SOL_SOCKET && cmsg->cmsg_type == SCM_RIGHTS) {
int *fds;
unsigned n_fds;