Merge branch-2-1

[netatalk.git] / etc / cnid_dbd / usockfd.c

diff --git a/etc/cnid_dbd/usockfd.c b/etc/cnid_dbd/usockfd.c
index d9dadb5b9828a879d447897a4acf8e8e060a177a..ceb6ff211ad6628693b18e48bb2c1fbec2925c03 100644 (file)
--- a/etc/cnid_dbd/usockfd.c
+++ b/etc/cnid_dbd/usockfd.c
@@ -155,7 +155,6 @@ int usockfd_check(int sockfd, const sigset_t *sigset)
     socklen_t size;
     fd_set readfds;
     int ret;
-    struct timeval tv;
      
     FD_ZERO(&readfds);
     FD_SET(sockfd, &readfds);
@@ -177,10 +176,6 @@ int usockfd_check(int sockfd, const sigset_t *sigset)
                 strerror(errno));
             return -1;
         }
-        if (setnonblock(fd, 1) != 0) {
-            LOG(log_error, logtype_cnid, "setnonblock: %s", strerror(errno));
-            return -1;
-        }
         return fd;
     } else
         return 0;