From 25b30c08dce8c04b7b98c02ac1de61d7aa76798f Mon Sep 17 00:00:00 2001 From: Samba Release Account Date: Wed, 17 Jul 1996 18:33:36 +0000 Subject: lots of changes to nmbd lkcl (This used to be commit 45d3b2644733333c657c48a69719fec72881f7df) --- source3/namedbname.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'source3/namedbname.c') diff --git a/source3/namedbname.c b/source3/namedbname.c index 82b19077f9..c06d10f60c 100644 --- a/source3/namedbname.c +++ b/source3/namedbname.c @@ -120,7 +120,7 @@ void remove_name(struct subnet_record *d, struct name_record *n) **************************************************************************/ struct name_record *find_name(struct name_record *n, struct nmb_name *name, - int search, struct in_addr ip) + int search) { struct name_record *ret; @@ -132,12 +132,7 @@ struct name_record *find_name(struct name_record *n, if ((search&FIND_SELF) == FIND_SELF && ret->source != SELF) continue; - /* zero ip is either samba's ip or a way of finding a - name without needing to know the ip address */ - if (zero_ip(ip) || ip_equal(ip, ret->ip)) - { - return ret; - } + return ret; } } return NULL; @@ -161,7 +156,9 @@ struct name_record *find_name_search(struct subnet_record **d, { if (*d != NULL) { - return find_name((*d)->namelist, name, search, ip); + DEBUG(4,("find_name on local: %s %s search %x\n", + namestr(name),inet_ntoa(ip), search)); + return find_name((*d)->namelist, name, search); } else { @@ -180,7 +177,9 @@ struct name_record *find_name_search(struct subnet_record **d, if (*d == NULL) return NULL; - return find_name((*d)->namelist, name, search, ip); + DEBUG(4,("find_name on WINS: %s %s search %x\n", + namestr(name),inet_ntoa(ip), search)); + return find_name((*d)->namelist, name, search); } -- cgit