sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

samba/source/nmbd/nmbd.c change remote_machine name to nmbd instead

Browse Source 
of nmb so we write to same log file that
				was originally created as log.nmbd
samba/source/smbd/server.c	change remote_machine name to smbd instead
				of smb so we write to same log file that
				was originally created as log.smbd
samba/source/lib/interface.c	allow binding to all interface IP addresses
				even if on same subnet. This allows you to
				specify which IP's you want in interfaces
				line and use bind interfaces only
(This used to be commit 01dfd59712)
This commit is contained in:
Herb Lewis 2001-02-15 19:50:34 +00:00
parent c237db1c11
commit a82df9c673
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source3/lib/interface.c
View File

@ -41,13 +41,15 @@ static struct interface *local_interfaces = NULL;
/****************************************************************************
Try and find an interface that matches an ip. If we cannot, return NULL
**************************************************************************/
static struct interface *iface_find(struct in_addr ip)
static struct interface *iface_find(struct in_addr ip, BOOL CheckMask)
{
struct interface *i;
if (zero_ip(ip)) return local_interfaces;
for (i=local_interfaces;i;i=i->next)
if (same_net(i->ip,ip,i->nmask)) return i;
if (CheckMask) {
if (same_net(i->ip,ip,i->nmask)) return i;
} else if ((i->ip).s_addr == ip.s_addr) return i;
return NULL;
}
@ -59,7 +61,7 @@ add an interface to the linked list of interfaces
static void add_interface(struct in_addr ip, struct in_addr nmask)
{
struct interface *iface;
if (iface_find(ip)) {
if (iface_find(ip, False)) {
DEBUG(3,("not adding duplicate interface %s\n",inet_ntoa(ip)));
return;
}
@ -365,12 +367,12 @@ unsigned iface_hash(void)
struct in_addr *iface_bcast(struct in_addr ip)
{
struct interface *i = iface_find(ip);
struct interface *i = iface_find(ip, True);
return(i ? &i->bcast : &local_interfaces->bcast);
}
struct in_addr *iface_ip(struct in_addr ip)
{
struct interface *i = iface_find(ip);
struct interface *i = iface_find(ip, True);
return(i ? &i->ip : &local_interfaces->ip);
}

2
source3/nmbd/nmbd.c
View File

@ -272,7 +272,7 @@ static BOOL reload_nmbd_services(BOOL test)
BOOL ret;
extern fstring remote_machine;
fstrcpy( remote_machine, "nmb" );
fstrcpy( remote_machine, "nmbd" );
if ( lp_loaded() )
{

2
source3/smbd/server.c
View File

@ -636,7 +636,7 @@ static void usage(char *pname)
slprintf(debugf, sizeof(debugf), "%s/log.smbd", LOGFILEBASE);
}
pstrcpy(remote_machine, "smb");
pstrcpy(remote_machine, "smbd");
setup_logging(argv[0],False);