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)

5 files changed, 8 insertions, 12 deletions

diff --git a/source3/torture/locktest.c b/source3/torture/locktest.c
index ccff2b2624..8606c9e38a 100644
--- a/source3/torture/locktest.c
+++ b/source3/torture/locktest.c
@@ -147,7 +147,6 @@ struct cli_state *connect_one(char *share)
 	char *server_n;
 	fstring server;
 	struct in_addr ip;
-	extern struct in_addr ipzero;
 	fstring myname;
 	static int count;
 
@@ -159,7 +158,7 @@ struct cli_state *connect_one(char *share)
 
 	server_n = server;
 	
-	ip = ipzero;
+        zero_ip(&ip);
 
 	slprintf(myname,sizeof(myname), "lock-%u-%u", getpid(), count++);
 
@@ -167,7 +166,7 @@ struct cli_state *connect_one(char *share)
 	make_nmb_name(&called , server, 0x20);
 
  again:
-	ip = ipzero;
+        zero_ip(&ip);
 
 	/* have to open a new connection */
 	if (!(c=cli_initialise(NULL)) || !cli_connect(c, server_n, &ip)) {
diff --git a/source3/torture/locktest2.c b/source3/torture/locktest2.c
index db5e17921c..49c8b2a8a9 100644
--- a/source3/torture/locktest2.c
+++ b/source3/torture/locktest2.c
@@ -157,7 +157,6 @@ struct cli_state *connect_one(char *share)
 	char *server_n;
 	fstring server;
 	struct in_addr ip;
-	extern struct in_addr ipzero;
 	fstring myname;
 	static int count;
 
@@ -169,7 +168,7 @@ struct cli_state *connect_one(char *share)
 
 	server_n = server;
 	
-	ip = ipzero;
+        zero_ip(&ip);
 
 	slprintf(myname,sizeof(myname), "lock-%u-%u", getpid(), count++);
 
@@ -177,7 +176,7 @@ struct cli_state *connect_one(char *share)
 	make_nmb_name(&called , server, 0x20);
 
  again:
-	ip = ipzero;
+        zero_ip(&ip);
 
 	/* have to open a new connection */
 	if (!(c=cli_initialise(NULL)) || !cli_connect(c, server_n, &ip)) {
diff --git a/source3/torture/masktest.c b/source3/torture/masktest.c
index d57b26bee4..e8c88a9fc1 100644
--- a/source3/torture/masktest.c
+++ b/source3/torture/masktest.c
@@ -165,7 +165,6 @@ struct cli_state *connect_one(char *share)
 	char *server_n;
 	char *server;
 	struct in_addr ip;
-	extern struct in_addr ipzero;
 
 	server = share+2;
 	share = strchr_m(server,'\\');
@@ -175,13 +174,13 @@ struct cli_state *connect_one(char *share)
 
 	server_n = server;
 	
-	ip = ipzero;
+        zero_ip(&ip);
 
 	make_nmb_name(&calling, "masktest", 0x0);
 	make_nmb_name(&called , server, 0x20);
 
  again:
-	ip = ipzero;
+        zero_ip(&ip);
 
 	/* have to open a new connection */
 	if (!(c=cli_initialise(NULL)) || !cli_connect(c, server_n, &ip)) {
diff --git a/source3/torture/rpctorture.c b/source3/torture/rpctorture.c
index e767c715e9..231e3a75f5 100644
--- a/source3/torture/rpctorture.c
+++ b/source3/torture/rpctorture.c
@@ -409,7 +409,7 @@ enum client_action
 			case 'I':
 			{
 				cli_info.dest_ip = *interpret_addr2(optarg);
-				if (zero_ip(cli_info.dest_ip))
+				if (is_zero_ip(cli_info.dest_ip))
 				{
 					exit(1);
 				}
diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index 234f3d3335..bc3310886d 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -93,14 +93,13 @@ static BOOL open_nbt_connection(struct cli_state *c)
 {
 	struct nmb_name called, calling;
 	struct in_addr ip;
-	extern struct in_addr ipzero;
 
 	ZERO_STRUCTP(c);
 
 	make_nmb_name(&calling, myname, 0x0);
 	make_nmb_name(&called , host, 0x20);
 
-	ip = ipzero;
+        zero_ip(&ip);
 
 	if (!cli_initialise(c) || !cli_connect(c, host, &ip)) {
 		printf("Failed to connect with %s\n", host);