* FIX: On some systems, atalkd refuses to start, since it couldn't detect

       any interfaces. This was caused by an overzealous validity check.

diff --git a/NEWS b/NEWS
index b991bccae85457db4db029812295f194b3baa631..edb2bbbbc4e2fc41b0db8d87f6e46b7d97bd16c2 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,8 @@ Changes from 1.5rc2
 
 * FIX: Compilation on Tru64 systems was broken, since libtool's acinclude.m4
        file on the packagers system did not contain the necessary patch.
+* FIX: On some systems, atalkd refuses to start, since it couldn't detect
+       any interfaces. This was caused by an overzealous validity check.
 
 Changes from 1.5rc1
 ===================

diff --git a/libatalk/util/getiface.c b/libatalk/util/getiface.c
index 3259510b28698113ed00ccf9feeecf2b5d72205b..867e6d6298eebf678b35ab669e2e69c04f2de581 100644 (file)
--- a/libatalk/util/getiface.c
+++ b/libatalk/util/getiface.c
@@ -80,7 +80,7 @@ static int getifaces(const int sockfd, char ***list, int *length)
     int                        ifrsize, i = 0;
        char **new;
 
-    if (!list || *length < 1)
+    if (!list)
       return 0;
 
     memset( &ifc, 0, sizeof( struct ifconf ));
@@ -120,7 +120,6 @@ static int getifaces(const int sockfd, char ***list, int *length)
 char **getifacelist()
 {
   char **list;
-  char **new;
   int  length, i, fd;
 
   if ((fd = socket(PF_INET, SOCK_STREAM, 0)) < 0)
@@ -133,10 +132,6 @@ char **getifacelist()
   }
   close(fd);
 
-  if ((i < length) && 
-      (new = (char **) realloc(list, (i + 1) *  sizeof(char *))))
-    return new;
-
   return list;
 }