From 24ca89bfb03fb82e975eff94070275ee403cd0f9 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Sat, 14 Nov 1998 01:04:13 +0000 Subject: Removed acconfig.h configure configure.in include/config.h.in: Made smbwrapper not made by default. nmbd*: Changed all calls to namestr() to nmbd_namestr() to fix broken FreeBSD include file problem...sigh. Jeremy. (This used to be commit 9ee8f39aed8772a05c203161b4ae6b7d90d67481) --- source3/nmbd/nmbd_namequery.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'source3/nmbd/nmbd_namequery.c') diff --git a/source3/nmbd/nmbd_namequery.c b/source3/nmbd/nmbd_namequery.c index 7c2b0d4d76..fae045882f 100644 --- a/source3/nmbd/nmbd_namequery.c +++ b/source3/nmbd/nmbd_namequery.c @@ -56,7 +56,7 @@ static void query_name_response(struct subnet_record *subrec, the response but don't send out any more query requests. */ DEBUG(5,("query_name_response: WACK from WINS server %s in querying \ -name %s on subnet %s.\n", inet_ntoa(p->ip), namestr(question_name), subrec->subnet_name)); +name %s on subnet %s.\n", inet_ntoa(p->ip), nmb_namestr(question_name), subrec->subnet_name)); rrec->repeat_count = 0; /* How long we should wait for. */ @@ -70,7 +70,7 @@ name %s on subnet %s.\n", inet_ntoa(p->ip), namestr(question_name), subrec->subn DEBUG(5,("query_name_response: On subnet %s - negative response \ from IP %s for name %s. Error code was %d.\n", subrec->subnet_name, inet_ntoa(p->ip), - namestr(question_name), nmb->header.rcode)); + nmb_namestr(question_name), nmb->header.rcode)); } else { @@ -79,7 +79,7 @@ from IP %s for name %s. Error code was %d.\n", subrec->subnet_name, inet_ntoa(p- putip((char *)&answer_ip,&nmb->answers->rdata[2]); DEBUG(5,("query_name_response: On subnet %s - positive response from IP %s \ for name %s. IP of that name is %s\n", subrec->subnet_name, inet_ntoa(p->ip), - namestr(question_name), inet_ntoa(answer_ip))); + nmb_namestr(question_name), inet_ntoa(answer_ip))); /* Interestingly, we could add these names to our namelists, and change nmbd to a model that checked its own name cache first, @@ -91,7 +91,7 @@ for name %s. IP of that name is %s\n", subrec->subnet_name, inet_ntoa(p->ip), { DEBUG(0,("query_name_response: Multiple (%d) responses received for a query on \ subnet %s for name %s. This response was from IP %s\n", - rrec->num_msgs, subrec->subnet_name, namestr(question_name), + rrec->num_msgs, subrec->subnet_name, nmb_namestr(question_name), inet_ntoa(p->ip) )); /* We have already called the success or fail function, so we @@ -131,7 +131,7 @@ static void query_name_timeout_response(struct subnet_record *subrec, if(failed) { DEBUG(5,("query_name_timeout_response: No response to querying name %s on subnet %s.\n", - namestr(question_name), subrec->subnet_name)); + nmb_namestr(question_name), subrec->subnet_name)); if(rrec->fail_fn) (*rrec->fail_fn)(subrec, rrec, question_name, 0); @@ -204,7 +204,7 @@ BOOL query_name(struct subnet_record *subrec, char *name, int type, if(rrec.rdlength > MAX_DGRAM_SIZE) { DEBUG(0,("query_name: nmbd internal error - there are %d ip addresses for name %s.\n", - namerec->data.num_ips, namestr(&nmbname) )); + namerec->data.num_ips, nmb_namestr(&nmbname) )); return False; } @@ -229,7 +229,7 @@ BOOL query_name(struct subnet_record *subrec, char *name, int type, &nmbname) == NULL) { DEBUG(0,("query_name: Failed to send packet trying to query name %s\n", - namestr(&nmbname))); + nmb_namestr(&nmbname))); return True; } return False; @@ -258,7 +258,7 @@ BOOL query_name_from_wins_server(struct in_addr ip_to, &nmbname) == NULL) { DEBUG(0,("query_name_from_wins_server: Failed to send packet trying to query name %s\n", - namestr(&nmbname))); + nmb_namestr(&nmbname))); return True; } return False; -- cgit