Merge "Clean up CLOEXEC in SocketListener."

Havoc-OS · Feb 23, 2016 · ed83cfb · ed83cfb
2 parents f405d24 + fcd7295
commit ed83cfb
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/libsysutils/src/SocketListener.cpp b/libsysutils/src/SocketListener.cpp
@@ -206,15 +206,14 @@ void SocketListener::runListener() {
 
             do {
                 alen = sizeof(ss);
-                c = accept(mSock, addrp, &alen);
+                c = accept4(mSock, addrp, &alen, SOCK_CLOEXEC);
                 SLOGV("%s got %d from accept", mSocketName, c);
             } while (c < 0 && errno == EINTR);
             if (c < 0) {
                 SLOGE("accept failed (%s)", strerror(errno));
                 sleep(1);
                 continue;
             }
-            fcntl(c, F_SETFD, FD_CLOEXEC);
             pthread_mutex_lock(&mClientsLock);
             mClients->push_back(new SocketClient(c, true, mUseCmdNum));
             pthread_mutex_unlock(&mClientsLock);