@@ -671,6 +671,12 @@ int main(int argc, char **argv)

         }

 #endif

+        if (nlsockets == 0) {

+            logg("!Not listening on any interfaces\n");

+            ret = 1;

+            break;

+        }

+

         ret = recvloop_th(lsockets, nlsockets, engine, dboptions, opts);

     } while (0);

@@ -55,6 +55,7 @@ int tcpserver(int **lsockets, unsigned int *nlsockets, char *ipaddr, const struc

     char *estr, port[10];

     int yes = 1;

     int res;

+    unsigned int i=0;

     sockets = *lsockets;

@@ -65,12 +66,23 @@ int tcpserver(int **lsockets, unsigned int *nlsockets, char *ipaddr, const struc

     hints.ai_socktype = SOCK_STREAM;

     hints.ai_flags = AI_PASSIVE;

+#if C_LINUX

+    if (!(ipaddr)) {

+        /*

+         * By default, getaddrinfo() will return 0.0.0.0 if NULL is passed in as the first parameter.

+         * Binding to 0.0.0.0 will prevent us from also binding IPv6 ::0 (errno = EADDRINUSE). However,

+         * if we bind to ::0 (or shorthand, ::), then Linux will bind to both IPv4 and IPv6.

+         */

+        ipaddr = "::";

+    }

+#endif

+

     if ((res = getaddrinfo(ipaddr, port, &hints, &info))) {

         logg("!TCP: getaddrinfo: %s\n", gai_strerror(res));

         return -1;

     }

-    for (p = info; p != NULL; p = p->ai_next) {

+    for (p = info; p != NULL; p = p->ai_next, i++) {

         t = realloc(sockets, sizeof(int) * (*nlsockets + 1));

         if (!(t)) {

             return -1;

@@ -89,7 +101,8 @@ int tcpserver(int **lsockets, unsigned int *nlsockets, char *ipaddr, const struc

         if(bind(sockfd, p->ai_addr, p->ai_addrlen) == -1) {

             estr = strerror(errno);

-            logg("!TCP: bind() error when trying to listen on [%s]:%s: %s\n", ipaddr, port, estr);

+            if (ipaddr || i == 0)

+                logg("!TCP: bind() error when trying to listen on [%s]:%s: %s\n", ipaddr, port, estr);

             closesocket(sockfd);

             continue;

@@ -66,7 +66,7 @@

 unsigned long int maxstream;

 #ifndef _WIN32

-static struct sockaddr_un nixsock;

+struct sockaddr_un nixsock;

 #endif

 extern struct optstruct *clamdopts;

@@ -117,16 +117,35 @@ static int isremote(const struct optstruct *opts) {

                 continue;

             }

-            ret = (bind(s, (struct sockaddr *)&testsock, (socklen_t)sizeof(testsock)) != 0);

-            closesocket(s);

+            switch (p->ai_family) {

+            case AF_INET:

+                ((struct sockaddr_in *)(p->ai_addr))->sin_port = htons(INADDR_ANY);

+                break;

+            case AF_INET6:

+                ((struct sockaddr_in6 *)(p->ai_addr))->sin6_port = htons(INADDR_ANY);

+                break;

+            default:

+                break;

+            }

+

+            ret = bind(s, p->ai_addr, p->ai_addrlen);

             if (ret) {

-                /* 

-                 * If we can't bind, then either we're attempting to listen on an IP that isn't

-                 * ours or that clamd is already listening on.

-                 */

+                if (errno == EADDRINUSE) {

+                    /* 

+                     * If we can't bind, then either we're attempting to listen on an IP that isn't

+                     * ours or that clamd is already listening on.

+                     */

+                    closesocket(s);

+                    freeaddrinfo(info);

+                    return 0;

+                }

+

+                closesocket(s);

                 freeaddrinfo(info);

                 return 1;

             }

+

+            closesocket(s);

         }

         freeaddrinfo(info);

@@ -134,7 +153,7 @@ static int isremote(const struct optstruct *opts) {

         opt = opt->nextarg;

     }

-    return 1;

+    return 0;

 }

@@ -55,6 +55,9 @@

 extern unsigned long int maxstream;

 int printinfected;

 extern struct optstruct *clamdopts;

+#ifndef _WIN32

+extern struct sockaddr_un nixsock;

+#endif

 static const char *scancmd[] = { "CONTSCAN", "MULTISCAN", "INSTREAM", "FILDES", "ALLMATCHSCAN" };

@@ -66,6 +69,18 @@ int dconnect() {

     struct addrinfo hints, *info, *p;

     char port[10];

+#ifndef _WIN32

+    opt = optget(clamdopts, "LocalSocket");

+    if (opt->enabled) {

+        if ((sockd = socket(AF_UNIX, SOCK_STREAM, 0)) >= 0) {

+            if (connect(sockd, (struct sockaddr *)&nixsock, sizeof(nixsock)) == 0)

+                return sockd;

+            else

+                close(sockd);

+        }

+    }

+#endif

+

     snprintf(port, sizeof(port), "%lld", optget(clamdopts, "TCPSocket")->numarg);

     opt = optget(clamdopts, "TCPAddr");