summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorSamba Release Account <samba-bugs@samba.org>1997-07-11 00:54:45 +0000
committerSamba Release Account <samba-bugs@samba.org>1997-07-11 00:54:45 +0000
commit792771ecc954892e85f7715136a4d70221f90d85 (patch)
treebc4954821dfe2dc1f93671b69b44bf2f3eaef074 /source3
parent0378cd5a8c42b99007ec54ac8a65bf21b9c9bfac (diff)
downloadsamba-792771ecc954892e85f7715136a4d70221f90d85.tar.gz
samba-792771ecc954892e85f7715136a4d70221f90d85.tar.bz2
samba-792771ecc954892e85f7715136a4d70221f90d85.zip
interface.c: Fix for AIX4.x finding interfaces.
server.c: Subtle fix for filenames containing ':'. Jeremy (jallison@whistle.com) (This used to be commit ee9f57bab25e5ee07fb2d384b8c416576401a6ab)
Diffstat (limited to 'source3')
-rw-r--r--source3/lib/interface.c2
-rw-r--r--source3/smbd/server.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/source3/lib/interface.c b/source3/lib/interface.c
index 444d511426..940af1eccf 100644
--- a/source3/lib/interface.c
+++ b/source3/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/source3/smbd/server.c b/source3/smbd/server.c
index 768c7c71bc..528e4769ea 100644
--- a/source3/smbd/server.c
+++ b/source3/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;
}