summaryrefslogtreecommitdiff
path: root/src/libsystemd-network/sd-dhcp-server.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-02-12 11:44:48 +0100
committerLennart Poettering <lennart@poettering.net>2015-02-12 11:45:39 +0100
commita38d99451f2bf8026ec51aee91662292e823c6a8 (patch)
tree312f02b7057b65dbaf42c796f814f43b064ef9ab /src/libsystemd-network/sd-dhcp-server.c
parentd01efa07444e49aafd78e0aa822168da688d53f5 (diff)
Revert "tree-wide: Always use recvmsg with MSG_CMSG_CLOEXEC"
This reverts commit d6d810fbf8071f8510450dbacd1d083f37603656. It's apparently not OK to pass MSG_CMSG_CLOEXEC to recvmsg() of raw sockets.
Diffstat (limited to 'src/libsystemd-network/sd-dhcp-server.c')
-rw-r--r--src/libsystemd-network/sd-dhcp-server.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsystemd-network/sd-dhcp-server.c b/src/libsystemd-network/sd-dhcp-server.c
index 1cb782fca3..3f89f344d7 100644
--- a/src/libsystemd-network/sd-dhcp-server.c
+++ b/src/libsystemd-network/sd-dhcp-server.c
@@ -897,7 +897,7 @@ static int server_receive_message(sd_event_source *s, int fd,
iov.iov_base = message;
iov.iov_len = buflen;
- len = recvmsg(fd, &msg, MSG_CMSG_CLOEXEC);
+ len = recvmsg(fd, &msg, 0);
if (len < buflen)
return 0;
else if ((size_t)len < sizeof(DHCPMessage))