Merge branch 'devel/tizen_3.0' into tizen

* devel/tizen_3.0:
  sensord: close socket fd if accept() is failed
  Fix for build errors of packages that are using deprecated sensor api

Change-Id: Ia12d0ce64bb7521f03e45055ea51c1673cf5e548
Signed-off-by: kibak.yoon <kibak.yoon@samsung.com>

diff --git a/src/shared/csocket.cpp b/src/shared/csocket.cpp
index 9d80138..5fbb2c1 100644 (file)
--- a/src/shared/csocket.cpp
+++ b/src/shared/csocket.cpp
@@ -154,8 +154,10 @@ bool csocket::accept(csocket& client_socket) const
 
        do {
                client_socket.m_sock_fd = ::accept(m_sock_fd, (sockaddr *)&m_addr, (socklen_t *)&addr_length);
-               if (!client_socket.is_valid())
+               if (!client_socket.is_valid()) {
                        err = errno;
+                       ::close(client_socket.m_sock_fd);
+               }
        } while (err == EINTR);
 
        if (!client_socket.is_valid()) {