r20245: merge 20244 from samba_3_0_24

get rid of more nested extern declarations warnings
(This used to be commit e9df051f5201843e3428ddbed7a719553c2e799a)

3 files changed, 10 insertions, 7 deletions

diff --git a/source3/torture/locktest.c b/source3/torture/locktest.c
index c3200ca038..31fd0225f8 100644
--- a/source3/torture/locktest.c
+++ b/source3/torture/locktest.c
@@ -36,6 +36,9 @@ static unsigned min_length = 0;
 static BOOL exact_error_codes;
 static BOOL zero_zero;
 
+extern char *optarg;
+extern int optind;
+
 #define FILENAME "\\locktest.dat"
 
 #define READ_PCT 50
@@ -581,8 +584,6 @@ static void usage(void)
  int main(int argc,char *argv[])
 {
 	char *share[NSERVERS];
-	extern char *optarg;
-	extern int optind;
 	int opt;
 	char *p;
 	int seed, server;
diff --git a/source3/torture/locktest2.c b/source3/torture/locktest2.c
index 5f2f2499ac..0a897fb206 100644
--- a/source3/torture/locktest2.c
+++ b/source3/torture/locktest2.c
@@ -29,6 +29,9 @@ static BOOL analyze;
 static BOOL hide_unlock_fails;
 static BOOL use_oplocks;
 
+extern char *optarg;
+extern int optind;
+
 #define FILENAME "\\locktest.dat"
 #define LOCKRANGE 100
 #define LOCKBASE 0
@@ -471,8 +474,6 @@ static void usage(void)
  int main(int argc,char *argv[])
 {
 	char *share1, *share2, *nfspath1, *nfspath2;
-	extern char *optarg;
-	extern int optind;
 	int opt;
 	char *p;
 	int seed;
diff --git a/source3/torture/masktest.c b/source3/torture/masktest.c
index 2ce59c86e6..f97fb97542 100644
--- a/source3/torture/masktest.c
+++ b/source3/torture/masktest.c
@@ -33,6 +33,10 @@ static int die_on_error;
 static int NumLoops = 0;
 static int ignore_dot_errors = 0;
 
+extern char *optarg;
+extern int optind;
+extern BOOL AllowDebugChange;
+
 /* a test fn for LANMAN mask support */
 int ms_fnmatch_lanman_core(const char *pattern, const char *string)
 {
@@ -426,9 +430,6 @@ static void usage(void)
 {
 	char *share;
 	struct cli_state *cli;	
-	extern char *optarg;
-	extern int optind;
-	extern BOOL AllowDebugChange;
 	int opt;
 	char *p;
 	int seed;