Revert "netd: set CLOEXEC on inherited /dev/socket/netd fd"
This reverts commit aae6f53ed0a1b0769c58774f702f9cbb49a0bf98.
Reason for revert: https://android-review.googlesource.com/c/platform/system/netd/+/957201 removed the netd socket.
Bug: 65862741
Change-Id: Ie7e598b9e50e1abfc9a90c25603d66bd08fa028a
Signed-off-by: Maciej Żenczykowski <maze@google.com>
diff --git a/server/main.cpp b/server/main.cpp
index c209204..b783ce5 100644
--- a/server/main.cpp
+++ b/server/main.cpp
@@ -64,7 +64,6 @@
using android::netdutils::Stopwatch;
const char* const PID_FILE_PATH = "/data/misc/net/netd_pid";
-constexpr const char NETD_SOCKET_NAME[] = "netd";
constexpr const char DNSPROXYLISTENER_SOCKET_NAME[] = "dnsproxyd";
std::mutex android::net::gBigNetdLock;
@@ -104,8 +103,8 @@
// Before we do anything that could fork, mark CLOEXEC the UNIX sockets that we get from init.
// FrameworkListener does this on initialization as well, but we only initialize these
// components after having initialized other subsystems that can fork.
- for (const auto& sock : {NETD_SOCKET_NAME, DNSPROXYLISTENER_SOCKET_NAME,
- FwmarkServer::SOCKET_NAME, MDnsSdListener::SOCKET_NAME}) {
+ for (const auto& sock :
+ {DNSPROXYLISTENER_SOCKET_NAME, FwmarkServer::SOCKET_NAME, MDnsSdListener::SOCKET_NAME}) {
setCloseOnExec(sock);
}