diff options
author | Tim Potter <tpot@samba.org> | 2001-11-26 03:11:44 +0000 |
---|---|---|
committer | Tim Potter <tpot@samba.org> | 2001-11-26 03:11:44 +0000 |
commit | 585d0efbc6428e5876d354fee49c241c1bad809d (patch) | |
tree | 48ef6538dc6855f6084a63fde1097032cc9e2ebc /source3/client/client.c | |
parent | 8b7434b2a0b8d138cd83e4feeecb9127d729c437 (diff) | |
download | samba-585d0efbc6428e5876d354fee49c241c1bad809d.tar.gz samba-585d0efbc6428e5876d354fee49c241c1bad809d.tar.bz2 samba-585d0efbc6428e5876d354fee49c241c1bad809d.zip |
Got medieval on another pointless extern. Removed extern struct ipzero
and replaced with two functions:
void zero_ip(struct in_adder *ip);
BOOL is_zero_ip(struct in_addr ip);
(This used to be commit 778f5f77a66cda76348a7c6f64cd63afe2bfe077)
Diffstat (limited to 'source3/client/client.c')
-rw-r--r-- | source3/client/client.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/source3/client/client.c b/source3/client/client.c index c684f3fea6..2b0867cf7b 100644 --- a/source3/client/client.c +++ b/source3/client/client.c @@ -45,7 +45,6 @@ static char *cmdstr; static BOOL got_pass; static int io_bufsize = 64512; static BOOL use_kerberos; -extern struct in_addr ipzero; static int name_type = 0x20; static int max_protocol = PROTOCOL_NT1; @@ -2085,7 +2084,6 @@ struct cli_state *do_connect(const char *server, const char *share) struct nmb_name called, calling; const char *server_n; struct in_addr ip; - extern struct in_addr ipzero; fstring servicename; char *sharename; @@ -2102,13 +2100,13 @@ struct cli_state *do_connect(const char *server, const char *share) server_n = server; - ip = ipzero; + zero_ip(&ip); make_nmb_name(&calling, global_myname, 0x0); make_nmb_name(&called , server, name_type); again: - ip = ipzero; + zero_ip(&ip); if (have_ip) ip = dest_ip; /* have to open a new connection */ @@ -2366,12 +2364,12 @@ static int do_message_op(void) struct in_addr ip; struct nmb_name called, calling; - ip = ipzero; + zero_ip(&ip); make_nmb_name(&calling, global_myname, 0x0); make_nmb_name(&called , desthost, name_type); - ip = ipzero; + zero_ip(&ip); if (have_ip) ip = dest_ip; if (!(cli=cli_initialise(NULL)) || (cli_set_port(cli, port) != port) || !cli_connect(cli, desthost, &ip)) { @@ -2584,7 +2582,7 @@ static int do_message_op(void) case 'I': { dest_ip = *interpret_addr2(optarg); - if (zero_ip(dest_ip)) + if (is_zero_ip(dest_ip)) exit(1); have_ip = True; } |