declare dbf in one spot

(This used to be commit f41c3bb80f1e498a9d27f6e236b0ff3a742764c9)

21 files changed, 7 insertions, 19 deletions

diff --git a/source3/client/client.c b/source3/client/client.c
index c9842335a9..72fa4bf87e 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -2280,7 +2280,6 @@ static int do_message_op(void)
 	fstring base_directory;
 	char *pname = argv[0];
 	int opt;
-	extern XFILE *dbf;
 	extern char *optarg;
 	extern int optind;
 	int old_debug;
diff --git a/source3/client/clitar.c b/source3/client/clitar.c
index 6169c9af46..49ea5edf47 100644
--- a/source3/client/clitar.c
+++ b/source3/client/clitar.c
@@ -71,7 +71,6 @@ stack dir_stack = {NULL, 0}; /* Want an empty stack */
 #define SEPARATORS " \t\n\r"
 extern int DEBUGLEVEL;
 extern struct cli_state *cli;
-extern XFILE *dbf;
 
 /* These defines are for the do_setrattr routine, to indicate
  * setting and reseting of file attributes in the function call */
diff --git a/source3/include/debug.h b/source3/include/debug.h
index 0bde9e69cf..cad802d8ca 100644
--- a/source3/include/debug.h
+++ b/source3/include/debug.h
@@ -40,6 +40,8 @@
 int  Debug1( char *, ... ) PRINTF_ATTRIBUTE(1,2);
 BOOL dbgtext( char *, ... ) PRINTF_ATTRIBUTE(1,2);
 
+extern XFILE *dbf;
+
 /* If we have these macros, we can add additional info to the header. */
 #ifdef HAVE_FILE_MACRO
 #define FILE_MACRO (__FILE__)
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 1f97a2d7ed..8cb587209c 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -626,6 +626,7 @@ extern int errno;
 #endif
 
 /* Lists, trees, caching, database... */
+#include "xfile.h"
 #include "ubi_sLinkList.h"
 #include "ubi_dLinkList.h"
 #include "dlinklist.h"
@@ -640,7 +641,6 @@ extern int errno;
 #include "messages.h"
 #include "util_list.h"
 #include "charset.h"
-#include "xfile.h"
 
 #include "util_getent.h"
 
diff --git a/source3/include/xfile.h b/source3/include/xfile.h
index 16390b49aa..fa4752fe30 100644
--- a/source3/include/xfile.h
+++ b/source3/include/xfile.h
@@ -19,6 +19,8 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#ifndef _XFILE_H_
+#define _XFILE_H_
 /*
   see xfile.c for explanations
 */
@@ -42,3 +44,5 @@ extern XFILE *x_stdin, *x_stdout, *x_stderr;
 #define X_IONBF 2
 
 #define x_getc(f) x_fgetc(f)
+
+#endif /* _XFILE_H_ */
diff --git a/source3/lib/cmd_interp.c b/source3/lib/cmd_interp.c
index fed3d65d62..62e361408b 100644
--- a/source3/lib/cmd_interp.c
+++ b/source3/lib/cmd_interp.c
@@ -917,7 +917,6 @@ static uint32 cmd_set(CLIENT_INFO *info, int argc, char *argv[])
 	BOOL interactive = True;
 	char *cmd_str = NULL;
 	int opt;
-	extern XFILE *dbf;
 	extern char *optarg;
 	static pstring servicesf = CONFIGFILE;
 	pstring term_code;
diff --git a/source3/lib/readline.c b/source3/lib/readline.c
index b03d37695e..76bc34f775 100644
--- a/source3/lib/readline.c
+++ b/source3/lib/readline.c
@@ -49,7 +49,6 @@ static char *smb_readline_replacement(char *prompt, void (*callback)(void),
                                                              int end))
 {
 	fd_set fds;
-	extern XFILE *dbf;
 	static pstring line;
 	struct timeval timeout;
 	int fd = fileno(stdin);
diff --git a/source3/nmbd/nmbd.c b/source3/nmbd/nmbd.c
index 141d055281..d8d0aa4626 100644
--- a/source3/nmbd/nmbd.c
+++ b/source3/nmbd/nmbd.c
@@ -666,7 +666,6 @@ static void usage(char *pname)
  int main(int argc,char *argv[])
 {
   int opt;
-  extern XFILE *dbf;
   extern char *optarg;
   extern BOOL  append_log;
 
diff --git a/source3/smbwrapper/smbsh.c b/source3/smbwrapper/smbsh.c
index ce54400488..1a38b0dea8 100644
--- a/source3/smbwrapper/smbsh.c
+++ b/source3/smbwrapper/smbsh.c
@@ -42,7 +42,6 @@ int main(int argc, char *argv[])
 	int opt;
 	extern char *optarg;
 	extern int optind;
-	extern XFILE *dbf;
 
 	dbf = x_stdout;
 	smbw_setup_shared();
diff --git a/source3/smbwrapper/smbw.c b/source3/smbwrapper/smbw.c
index 74a931587d..38dd3c02c8 100644
--- a/source3/smbwrapper/smbw.c
+++ b/source3/smbwrapper/smbw.c
@@ -47,7 +47,6 @@ void smbw_init(void)
 	extern BOOL in_client;
 	static int initialised;
 	static pstring servicesf = CONFIGFILE;
-	extern XFILE *dbf;
 	char *p;
 	int eno;
 	pstring line;
diff --git a/source3/torture/locktest.c b/source3/torture/locktest.c
index bcae4fa924..5ace2622ac 100644
--- a/source3/torture/locktest.c
+++ b/source3/torture/locktest.c
@@ -545,7 +545,6 @@ static void usage(void)
 	char *share[NSERVERS];
 	extern char *optarg;
 	extern int optind;
-	extern XFILE *dbf;
 	int opt;
 	char *p;
 	int seed, server;
diff --git a/source3/torture/locktest2.c b/source3/torture/locktest2.c
index 899310933f..d0808da638 100644
--- a/source3/torture/locktest2.c
+++ b/source3/torture/locktest2.c
@@ -533,7 +533,6 @@ static void usage(void)
 	char *share1, *share2, *nfspath1, *nfspath2;
 	extern char *optarg;
 	extern int optind;
-	extern XFILE *dbf;
 	int opt;
 	char *p;
 	int seed;
diff --git a/source3/torture/masktest.c b/source3/torture/masktest.c
index 0e054b4703..06abf5f3f6 100644
--- a/source3/torture/masktest.c
+++ b/source3/torture/masktest.c
@@ -420,7 +420,6 @@ static void usage(void)
 	struct cli_state *cli;	
 	extern char *optarg;
 	extern int optind;
-	extern XFILE *dbf;
 	int opt;
 	char *p;
 	int seed;
diff --git a/source3/torture/rpctorture.c b/source3/torture/rpctorture.c
index 5136a8e94b..154d277641 100644
--- a/source3/torture/rpctorture.c
+++ b/source3/torture/rpctorture.c
@@ -229,7 +229,6 @@ enum client_action
 {
 	char *pname = argv[0];
 	int opt;
-	extern XFILE *dbf;
 	extern char *optarg;
 	extern int optind;
 	static pstring servicesf = CONFIGFILE;
diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index 292a4d61e0..11c09b2d41 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -3077,7 +3077,6 @@ static void usage(void)
 	int gotpass = 0;
 	extern char *optarg;
 	extern int optind;
-	extern XFILE *dbf;
 	static pstring servicesf = CONFIGFILE;
 	BOOL correct = True;
 
diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c
index 59744a9315..914e99367b 100644
--- a/source3/utils/smbcacls.c
+++ b/source3/utils/smbcacls.c
@@ -802,7 +802,6 @@ You can string acls together with spaces, commas or newlines\n\
 	pstring filename;
 	extern char *optarg;
 	extern int optind;
-	extern XFILE *dbf;
 	int opt;
 	char *p;
 	static pstring servicesf = CONFIGFILE;
diff --git a/source3/utils/smbtree.c b/source3/utils/smbtree.c
index 75390965b3..191a9124f7 100644
--- a/source3/utils/smbtree.c
+++ b/source3/utils/smbtree.c
@@ -325,7 +325,6 @@ static BOOL print_tree(struct user_auth_info *user_info)
 {
 	extern char *optarg;
 	extern int optind;
-	extern XFILE *dbf;
 	int opt;
 	char *p;
 	pstring servicesf = CONFIGFILE;
diff --git a/source3/utils/status.c b/source3/utils/status.c
index 7cbb1850de..47379fd57c 100644
--- a/source3/utils/status.c
+++ b/source3/utils/status.c
@@ -45,7 +45,6 @@ struct session_record{
 } *srecs;
 
 extern int DEBUGLEVEL;
-extern XFILE *dbf;
 
 static pstring Ucrit_username = "";                   /* added by OH */
 static pid_t	Ucrit_pid[100];  /* Ugly !!! */        /* added by OH */
diff --git a/source3/utils/testparm.c b/source3/utils/testparm.c
index e430fe414b..1caf792543 100644
--- a/source3/utils/testparm.c
+++ b/source3/utils/testparm.c
@@ -36,7 +36,6 @@
 #include "smb.h"
 
 /* these live in util.c */
-extern XFILE *dbf;
 extern int DEBUGLEVEL;
 
 /***********************************************
diff --git a/source3/utils/testprns.c b/source3/utils/testprns.c
index 6a5b35db3b..df697a0ed1 100644
--- a/source3/utils/testprns.c
+++ b/source3/utils/testprns.c
@@ -35,7 +35,6 @@
 #include "smb.h"
 
 /* these live in util.c */
-extern XFILE *dbf;
 extern int DEBUGLEVEL;
 
 int main(int argc, char *argv[])
diff --git a/source3/web/swat.c b/source3/web/swat.c
index 8551c5e907..56ce321f8d 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -999,7 +999,6 @@ static void printers_page(void)
 {
 	extern char *optarg;
 	extern int optind;
-	extern XFILE *dbf;
 	int opt;
 	char *page;