X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=etc%2Fcnid_dbd%2Fusockfd.c;h=269c6575beefbc8e5f5026d6d090425892a40d62;hb=4b29d079dcb5d06eca960c6f517bfda05612eb79;hp=30bb9e705896b610841bd71432fd0d0a6c5c5161;hpb=03a992a695725cad6e20ce0f9fd83385aa200926;p=netatalk.git

diff --git a/etc/cnid_dbd/usockfd.c b/etc/cnid_dbd/usockfd.c
index 30bb9e70..269c6575 100644
--- a/etc/cnid_dbd/usockfd.c
+++ b/etc/cnid_dbd/usockfd.c
@@ -11,24 +11,17 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#endif /* HAVE_UNISTD_H */
 #include <sys/un.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
-
-#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
-#endif /* HAVE_SYS_TYPES_H */
-#ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
-#endif /* HAVE_SYS_TIME_H */
-
 
 #include <atalk/logger.h>
+#include <atalk/compat.h>
 #include "usockfd.h"
 
 #include <sys/select.h>
@@ -65,6 +58,9 @@ int usockfd_create(char *usock_fn, mode_t mode, int backlog)
         return -1;
     }
 
+#ifdef chmod
+#undef chmod
+#endif
     if (chmod(usock_fn, mode) < 0) {
         LOG(log_error, logtype_cnid, "error changing permissions for %s: %s",
             usock_fn, strerror(errno));
@@ -89,15 +85,15 @@ int tsockfd_create(char *host, char *port, int backlog)
     hints.ai_socktype = SOCK_STREAM;
 
     if ((ret = getaddrinfo(host, port, &hints, &servinfo)) != 0) {
-        LOG(log_error, logtype_default, "tsockfd_create: getaddrinfo: %s\n", gai_strerror(ret));
-        return 0;
+        LOG(log_error, logtype_cnid, "tsockfd_create: getaddrinfo: %s\n", gai_strerror(ret));
+        return -1;
     }
 
     /* create a socket */
     /* loop through all the results and bind to the first we can */
     for (p = servinfo; p != NULL; p = p->ai_next) {
         if ((sockfd = socket(p->ai_family, p->ai_socktype, p->ai_protocol)) == -1) {
-            LOG(log_info, logtype_default, "tsockfd_create: socket: %s", strerror(errno));
+            LOG(log_info, logtype_cnid, "tsockfd_create: socket: %s", strerror(errno));
             continue;
         }
 
@@ -121,13 +117,13 @@ int tsockfd_create(char *host, char *port, int backlog)
             
         if (bind(sockfd, p->ai_addr, p->ai_addrlen) == -1) {
             close(sockfd);
-            LOG(log_info, logtype_default, "tsockfd_create: bind: %s\n", strerror(errno));
+            LOG(log_info, logtype_cnid, "tsockfd_create: bind: %s\n", strerror(errno));
             continue;
         }
 
         if (listen(sockfd, backlog) < 0) {
             close(sockfd);
-            LOG(log_info, logtype_default, "tsockfd_create: listen: %s\n", strerror(errno));
+            LOG(log_info, logtype_cnid, "tsockfd_create: listen: %s\n", strerror(errno));
             continue;
         }
 
@@ -136,7 +132,7 @@ int tsockfd_create(char *host, char *port, int backlog)
     }
 
     if (p == NULL)  {
-        LOG(log_error, logtype_default, "tsockfd_create: no suitable network config %s:%s", host, port);
+        LOG(log_error, logtype_cnid, "tsockfd_create: no suitable network config %s:%s", host, port);
         freeaddrinfo(servinfo);
         return -1;
     }
@@ -152,7 +148,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);
@@ -174,10 +169,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;