diff options
| author | Jeremy Allison <jra@samba.org> | 1998-11-14 01:04:13 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 1998-11-14 01:04:13 +0000 |
| commit | 24ca89bfb03fb82e975eff94070275ee403cd0f9 (patch) | |
| tree | 3a6816c1c78780a2dae2f50a84c141be1f236b91 /source3/libsmb | |
| parent | 744c34be2a053501a0fabd1c31a77e95f711f3e3 (diff) | |
| download | samba-24ca89bfb03fb82e975eff94070275ee403cd0f9.tar.gz samba-24ca89bfb03fb82e975eff94070275ee403cd0f9.tar.bz2 samba-24ca89bfb03fb82e975eff94070275ee403cd0f9.zip | |
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)
Diffstat (limited to 'source3/libsmb')
| -rw-r--r-- | source3/libsmb/clientgen.c | 6 | ||||
| -rw-r--r-- | source3/libsmb/nmblib.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c index 4eaebfa6ed..81f75d2cb2 100644 --- a/source3/libsmb/clientgen.c +++ b/source3/libsmb/clientgen.c @@ -2541,7 +2541,7 @@ BOOL cli_reestablish_connection(struct cli_state *cli) fstrcpy(dest_host, cli->full_dest_host_name); DEBUG(5,("cli_reestablish_connection: %s connecting to %s (ip %s) - %s [%s]\n", - namestr(&calling), namestr(&called), + nmb_namestr(&calling), nmb_namestr(&called), inet_ntoa(cli->dest_ip), cli->user_name, cli->domain)); @@ -2571,7 +2571,7 @@ BOOL cli_establish_connection(struct cli_state *cli, BOOL do_shutdown, BOOL do_tcon) { DEBUG(5,("cli_establish_connection: %s connecting to %s (%s) - %s [%s]\n", - namestr(calling), namestr(called), inet_ntoa(*dest_ip), + nmb_namestr(calling), nmb_namestr(called), inet_ntoa(*dest_ip), cli->user_name, cli->domain)); /* establish connection */ @@ -2586,7 +2586,7 @@ BOOL cli_establish_connection(struct cli_state *cli, if (!cli_connect(cli, dest_host, dest_ip)) { DEBUG(1,("cli_establish_connection: failed to connect to %s (%s)\n", - namestr(calling), inet_ntoa(*dest_ip))); + nmb_namestr(calling), inet_ntoa(*dest_ip))); return False; } } diff --git a/source3/libsmb/nmblib.c b/source3/libsmb/nmblib.c index 6314a9076b..b91a2944a3 100644 --- a/source3/libsmb/nmblib.c +++ b/source3/libsmb/nmblib.c @@ -66,7 +66,7 @@ static void debug_nmb_res_rec(struct res_rec *res, char *hdr) DEBUGADD( 4, ( " %s: nmb_name=%s rr_type=%d rr_class=%d ttl=%d\n", hdr, - namestr(&res->rr_name), + nmb_namestr(&res->rr_name), res->rr_type, res->rr_class, res->ttl ) ); @@ -131,7 +131,7 @@ void debug_nmb_packet(struct packet_struct *p) if (nmb->header.qdcount) { DEBUGADD( 4, ( " question: q_name=%s q_type=%d q_class=%d\n", - namestr(&nmb->question.question_name), + nmb_namestr(&nmb->question.question_name), nmb->question.question_type, nmb->question.question_class) ); } @@ -289,7 +289,7 @@ static int put_nmb_name(char *buf,int offset,struct nmb_name *name) /******************************************************************* useful for debugging messages ******************************************************************/ -char *namestr(struct nmb_name *n) +char *nmb_namestr(struct nmb_name *n) { static int i=0; static fstring ret[4]; |