diff options
| author | Lennart Poettering <lennart@poettering.net> | 2015-02-12 11:44:48 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-02-12 11:45:39 +0100 |
| commit | a38d99451f2bf8026ec51aee91662292e823c6a8 (patch) | |
| tree | 312f02b7057b65dbaf42c796f814f43b064ef9ab /src/libsystemd-network | |
| parent | d01efa07444e49aafd78e0aa822168da688d53f5 (diff) | |
| download | systemd-a38d99451f2bf8026ec51aee91662292e823c6a8.tar.gz | |
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')
| -rw-r--r-- | src/libsystemd-network/sd-dhcp-client.c | 2 | ||||
| -rw-r--r-- | src/libsystemd-network/sd-dhcp-server.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libsystemd-network/sd-dhcp-client.c b/src/libsystemd-network/sd-dhcp-client.c index 2f76e24ce3..5f90617b9e 100644 --- a/src/libsystemd-network/sd-dhcp-client.c +++ b/src/libsystemd-network/sd-dhcp-client.c @@ -1582,7 +1582,7 @@ static int client_receive_message_raw(sd_event_source *s, int fd, iov.iov_base = packet; iov.iov_len = buflen; - len = recvmsg(fd, &msg, MSG_CMSG_CLOEXEC); + len = recvmsg(fd, &msg, 0); if (len < 0) { log_dhcp_client(client, "could not receive message from raw " "socket: %m"); 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)) |