diff options
| author | Guenther Deschner <gd@samba.org> | 2007-10-11 15:18:50 +0200 |
|---|---|---|
| committer | Guenther Deschner <gd@samba.org> | 2007-10-11 15:18:50 +0200 |
| commit | 89d33395e31a7ccb6b091e4a99a30d12e3367238 (patch) | |
| tree | f2ec7c4ddbf9134ecae18e27bf792b90da372663 /source3/nmbd/nmbd_incomingrequests.c | |
| parent | 6b441e9e74b11bee4b661eaa17682d6351c264ff (diff) | |
| parent | edfcfefa37bf948c990e7ad3a1aea1dd4c3cea09 (diff) | |
| download | samba-89d33395e31a7ccb6b091e4a99a30d12e3367238.tar.gz samba-89d33395e31a7ccb6b091e4a99a30d12e3367238.tar.bz2 samba-89d33395e31a7ccb6b091e4a99a30d12e3367238.zip | |
Merge commit 'origin/v3-2-test' into my_branch
(This used to be commit fbe5edec375c99421d19af086c4f597e70c963b8)
Diffstat (limited to 'source3/nmbd/nmbd_incomingrequests.c')
| -rw-r--r-- | source3/nmbd/nmbd_incomingrequests.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/nmbd/nmbd_incomingrequests.c b/source3/nmbd/nmbd_incomingrequests.c index 956d0ab1e9..292a580ef9 100644 --- a/source3/nmbd/nmbd_incomingrequests.c +++ b/source3/nmbd/nmbd_incomingrequests.c @@ -88,7 +88,7 @@ subnet %s from owner IP %s\n", subrec->subnet_name, inet_ntoa(owner_ip))); /* If someone is releasing a broadcast group name, just ignore it. */ - if( group && !ismyip(owner_ip) ) + if( group && !ismyip_v4(owner_ip) ) return; /* @@ -98,7 +98,7 @@ subnet %s from owner IP %s\n", */ pull_ascii_nstring(qname, sizeof(qname), question->name); - if( !group && !ismyip(owner_ip) && strequal(qname, lp_workgroup()) && + if( !group && !ismyip_v4(owner_ip) && strequal(qname, lp_workgroup()) && ((question->name_type == 0x0) || (question->name_type == 0x1e))) { DEBUG(6,("process_name_release_request: FTP OnNet bug workaround. Ignoring \ group release name %s from IP %s on subnet %s with no group bit set.\n", @@ -497,7 +497,7 @@ void process_name_query_request(struct subnet_record *subrec, struct packet_stru if (namerec->data.source == WINS_PROXY_NAME) { for( i = 0; i < namerec->data.num_ips; i++) { - if (same_net(namerec->data.ip[i], subrec->myip, subrec->mask_ip)) { + if (same_net_v4(namerec->data.ip[i], subrec->myip, subrec->mask_ip)) { DEBUG(5,("process_name_query_request: name %s is a WINS proxy name and is also on the same subnet (%s) as the requestor. Not replying.\n", nmb_namestr(&namerec->name), subrec->subnet_name )); return; |