interface.c: Fix for AIX4.x finding interfaces.

server.c:		Subtle fix for filenames containing ':'.
Jeremy (jallison@whistle.com)

diff --git a/source/lib/interface.c b/source/lib/interface.c
index 444d511426b91255a2fe56349347ef0f7924c95d..940af1eccf4f8705dc437b91e214df8252fac55b 100644 (file)
--- a/source/lib/interface.c
+++ b/source/lib/interface.c
@@ -154,7 +154,7 @@ static void get_broadcast(struct in_addr *if_ipaddr,
       }
     }
   }
-#elif defined(__FreeBSD__) || defined(NETBSD) || defined(AMIGA)
+#elif defined(__FreeBSD__) || defined(NETBSD) || defined(AMIGA) || defined(_AIX41)
   ifc.ifc_len = sizeof(buff);
   ifc.ifc_buf = buff;
   if (ioctl(sock, SIOCGIFCONF, &ifc) < 0) {

diff --git a/source/smbd/server.c b/source/smbd/server.c
index 768c7c71bcab8328d09feed172a956eee3116e71..528e4769ea42df64c94e9c0dfddc827a2c286c41 100644 (file)
--- a/source/smbd/server.c
+++ b/source/smbd/server.c
@@ -397,7 +397,7 @@ static BOOL scan_directory(char *path, char *name,int snum,BOOL docache)
       if (!name_map_mangle(name2,False,snum)) continue;
 
       if ((mangled && mangled_equal(name,name2))
-         || fname_equal(name, name2))
+         || fname_equal(name, dname))
        {
          /* we've found the file, change it's name and return */
          if (docache) DirCacheAdd(path,name,dname,snum);
@@ -2102,7 +2102,7 @@ static BOOL open_sockets(BOOL is_daemon,int port)
       /* ready to listen */
       if (listen(s, 5) == -1) 
        {
-         DEBUG(0,("listen: %s",strerror(errno)));
+         DEBUG(0,("listen: %s\n",strerror(errno)));
          close(s);
          return False;
        }
@@ -2122,7 +2122,7 @@ static BOOL open_sockets(BOOL is_daemon,int port)
 
          if (Client == -1)
            {
-             DEBUG(0,("accept: %s",strerror(errno)));
+             DEBUG(0,("accept: %s\n",strerror(errno)));
              continue;
            }