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/libsmb | |
| 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/libsmb')
| -rw-r--r-- | source3/libsmb/cliconnect.c | 3 | ||||
| -rw-r--r-- | source3/libsmb/libsmbclient.c | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c index ffbc54ea5e..314ac6638a 100644 --- a/source3/libsmb/cliconnect.c +++ b/source3/libsmb/cliconnect.c @@ -972,12 +972,11 @@ open the client sockets ****************************************************************************/ BOOL cli_connect(struct cli_state *cli, const char *host, struct in_addr *ip) { - extern struct in_addr ipzero; extern pstring user_socket_options; fstrcpy(cli->desthost, host); - if (!ip || ip_equal(*ip, ipzero)) { + if (!ip || is_zero_ip(*ip)) { if (!resolve_name( cli->desthost, &cli->dest_ip, 0x20)) { return False; } diff --git a/source3/libsmb/libsmbclient.c b/source3/libsmb/libsmbclient.c index ce00548518..a85d9e45fc 100644 --- a/source3/libsmb/libsmbclient.c +++ b/source3/libsmb/libsmbclient.c @@ -246,9 +246,8 @@ struct smbc_server *smbc_server(char *server, char *share, fstring group; pstring ipenv; struct in_addr ip; - extern struct in_addr ipzero; - ip = ipzero; + zero_ip(&ip); ZERO_STRUCT(c); /* try to use an existing connection */ @@ -306,7 +305,7 @@ struct smbc_server *smbc_server(char *server, char *share, again: slprintf(ipenv,sizeof(ipenv)-1,"HOST_%s", server_n); - ip = ipzero; + zero_ip(&ip); /* have to open a new connection */ if (!cli_initialise(&c) || !cli_connect(&c, server_n, &ip)) { |