From dc1fc3ee8ec2199bc73bb5d7ec711c6800f61d65 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Tue, 2 Oct 2001 04:29:50 +0000
Subject: Removed 'extern int DEBUGLEVEL' as it is now in the smb.h header.
 (This used to be commit 2d0922b0eabfdc0aaf1d0797482fef47ed7fde8e)

---
 source3/smbd/auth.c           | 3 ---
 source3/smbd/auth_domain.c    | 2 --
 source3/smbd/auth_rhosts.c    | 6 ------
 source3/smbd/auth_server.c    | 4 ----
 source3/smbd/auth_smbpasswd.c | 5 -----
 source3/smbd/auth_unix.c      | 4 ----
 source3/smbd/auth_util.c      | 3 +--
 source3/smbd/blocking.c       | 2 +-
 source3/smbd/chgpasswd.c      | 1 -
 source3/smbd/close.c          | 2 --
 source3/smbd/conn.c           | 2 --
 source3/smbd/connection.c     | 3 ---
 source3/smbd/dfree.c          | 3 ---
 source3/smbd/dir.c            | 2 --
 source3/smbd/dosmode.c        | 2 --
 source3/smbd/error.c          | 2 --
 source3/smbd/fileio.c         | 2 --
 source3/smbd/filename.c       | 1 -
 source3/smbd/files.c          | 2 --
 source3/smbd/groupname.c      | 2 --
 source3/smbd/ipc.c            | 1 -
 source3/smbd/lanman.c         | 2 --
 source3/smbd/mangle.c         | 2 --
 source3/smbd/message.c        | 3 ---
 source3/smbd/negprot.c        | 1 -
 source3/smbd/notify.c         | 2 --
 source3/smbd/notify_hash.c    | 3 ---
 source3/smbd/notify_kernel.c  | 1 -
 source3/smbd/nttrans.c        | 1 -
 source3/smbd/open.c           | 2 --
 source3/smbd/oplock.c         | 2 --
 source3/smbd/oplock_irix.c    | 1 -
 source3/smbd/oplock_linux.c   | 2 --
 source3/smbd/password.c       | 1 -
 source3/smbd/pipes.c          | 2 --
 source3/smbd/process.c        | 2 --
 source3/smbd/quotas.c         | 2 --
 source3/smbd/reply.c          | 1 -
 source3/smbd/sec_ctx.c        | 1 -
 source3/smbd/server.c         | 2 --
 source3/smbd/service.c        | 4 ----
 source3/smbd/trans2.c         | 1 -
 source3/smbd/uid.c            | 2 --
 source3/smbd/vfs.c            | 2 --
 44 files changed, 2 insertions(+), 94 deletions(-)

(limited to 'source3/smbd')

diff --git a/source3/smbd/auth.c b/source3/smbd/auth.c
index 6aa2714b0b..e76324213e 100644
--- a/source3/smbd/auth.c
+++ b/source3/smbd/auth.c
@@ -23,8 +23,6 @@
 
 #include "includes.h"
 
-extern int DEBUGLEVEL;
-
 /****************************************************************************
  Check user is in correct domain if required
 ****************************************************************************/
@@ -257,4 +255,3 @@ BOOL password_ok(char *user, char *password, int pwlen)
 
 	return False;
 }
-
diff --git a/source3/smbd/auth_domain.c b/source3/smbd/auth_domain.c
index 111f0f143c..bcd41bacdb 100644
--- a/source3/smbd/auth_domain.c
+++ b/source3/smbd/auth_domain.c
@@ -22,8 +22,6 @@
 
 #include "includes.h"
 
-extern int DEBUGLEVEL;
-
 BOOL global_machine_password_needs_changing = False;
 
 /****************************************************************************
diff --git a/source3/smbd/auth_rhosts.c b/source3/smbd/auth_rhosts.c
index e319d8d5f8..cd1bf57f86 100644
--- a/source3/smbd/auth_rhosts.c
+++ b/source3/smbd/auth_rhosts.c
@@ -21,9 +21,6 @@
 
 #include "includes.h"
 
-extern int DEBUGLEVEL;
-
-
 /****************************************************************************
  Read the a hosts.equiv or .rhosts file and check if it
  allows this user from this machine.
@@ -181,6 +178,3 @@ NTSTATUS check_rhosts_security(const auth_usersupplied_info *user_info,
 
 	return nt_status;
 }
-
-
-
diff --git a/source3/smbd/auth_server.c b/source3/smbd/auth_server.c
index e4c91c4dcb..2574a52ef3 100644
--- a/source3/smbd/auth_server.c
+++ b/source3/smbd/auth_server.c
@@ -22,8 +22,6 @@
 
 #include "includes.h"
 
-extern int DEBUGLEVEL;
-
 extern pstring global_myname;
 
 /****************************************************************************
@@ -228,5 +226,3 @@ use this machine as the password server.\n"));
 
 	return(nt_status);
 }
-
-
diff --git a/source3/smbd/auth_smbpasswd.c b/source3/smbd/auth_smbpasswd.c
index 835ade739f..da223368b8 100644
--- a/source3/smbd/auth_smbpasswd.c
+++ b/source3/smbd/auth_smbpasswd.c
@@ -23,8 +23,6 @@
 
 #include "includes.h"
 
-extern int DEBUGLEVEL;
-
 /****************************************************************************
 core of smb password checking routine.
 ****************************************************************************/
@@ -319,6 +317,3 @@ NTSTATUS check_smbpasswd_security(const auth_usersupplied_info *user_info, auth_
 	pdb_free_sam(&sampass);
 	return nt_status;
 }
-
-
-
diff --git a/source3/smbd/auth_unix.c b/source3/smbd/auth_unix.c
index 0d73988d8a..2f9034e3e5 100644
--- a/source3/smbd/auth_unix.c
+++ b/source3/smbd/auth_unix.c
@@ -21,8 +21,6 @@
 
 #include "includes.h"
 
-extern int DEBUGLEVEL;
-
 /****************************************************************************
 update the encrypted smbpasswd file from the plaintext username and password
 
@@ -105,5 +103,3 @@ NTSTATUS check_unix_security(const auth_usersupplied_info *user_info, auth_serve
 
 	return nt_status;
 }
-
-
diff --git a/source3/smbd/auth_util.c b/source3/smbd/auth_util.c
index 1967c32b9a..d3b9aa7001 100644
--- a/source3/smbd/auth_util.c
+++ b/source3/smbd/auth_util.c
@@ -19,9 +19,8 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
-#include "includes.h"
 
-extern int DEBUGLEVEL;
+#include "includes.h"
 
 /* Data to do lanman1/2 password challenge. */
 static unsigned char saved_challenge[8];
diff --git a/source3/smbd/blocking.c b/source3/smbd/blocking.c
index cec1581254..a398a4c2a1 100644
--- a/source3/smbd/blocking.c
+++ b/source3/smbd/blocking.c
@@ -20,7 +20,7 @@
 */
 
 #include "includes.h"
-extern int DEBUGLEVEL;
+
 extern char *OutBuffer;
 
 /****************************************************************************
diff --git a/source3/smbd/chgpasswd.c b/source3/smbd/chgpasswd.c
index de49083960..fbcefd6128 100644
--- a/source3/smbd/chgpasswd.c
+++ b/source3/smbd/chgpasswd.c
@@ -49,7 +49,6 @@
 
 #include "includes.h"
 
-extern int DEBUGLEVEL;
 extern struct passdb_ops pdb_ops;
 
 static BOOL check_oem_password(char *user,
diff --git a/source3/smbd/close.c b/source3/smbd/close.c
index c92e084759..5c8c7996f5 100644
--- a/source3/smbd/close.c
+++ b/source3/smbd/close.c
@@ -21,8 +21,6 @@
 
 #include "includes.h"
 
-extern int DEBUGLEVEL;
-
 /****************************************************************************
 run a file if it is a magic script
 ****************************************************************************/
diff --git a/source3/smbd/conn.c b/source3/smbd/conn.c
index 08704927c5..f9d0ffc9bd 100644
--- a/source3/smbd/conn.c
+++ b/source3/smbd/conn.c
@@ -21,8 +21,6 @@
 
 #include "includes.h"
 
-extern int DEBUGLEVEL;
-
 /* set these to define the limits of the server. NOTE These are on a
    per-client basis. Thus any one machine can't connect to more than
    MAX_CONNECTIONS services, but any number of machines may connect at
diff --git a/source3/smbd/connection.c b/source3/smbd/connection.c
index e1b2bc071a..f6da678cb1 100644
--- a/source3/smbd/connection.c
+++ b/source3/smbd/connection.c
@@ -21,12 +21,9 @@
 
 #include "includes.h"
 
-
 extern fstring remote_machine;
 static TDB_CONTEXT *tdb;
 
-extern int DEBUGLEVEL;
-
 /****************************************************************************
  Return the connection tdb context (used for message send all).
 ****************************************************************************/
diff --git a/source3/smbd/dfree.c b/source3/smbd/dfree.c
index 7848309a5e..51f0614941 100644
--- a/source3/smbd/dfree.c
+++ b/source3/smbd/dfree.c
@@ -21,9 +21,6 @@
 
 #include "includes.h"
 
-
-extern int DEBUGLEVEL;
-
 /****************************************************************************
 normalise for DOS usage 
 ****************************************************************************/
diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c
index c0c728fe8f..59c8f1e97b 100644
--- a/source3/smbd/dir.c
+++ b/source3/smbd/dir.c
@@ -21,8 +21,6 @@
 
 #include "includes.h"
 
-extern int DEBUGLEVEL;
-
 /*
    This module implements directory related functions for Samba.
 */
diff --git a/source3/smbd/dosmode.c b/source3/smbd/dosmode.c
index 639e365d1b..0f15ef25c2 100644
--- a/source3/smbd/dosmode.c
+++ b/source3/smbd/dosmode.c
@@ -21,8 +21,6 @@
 
 #include "includes.h"
 
-extern int DEBUGLEVEL;
-
 /****************************************************************************
   change a dos mode to a unix mode
     base permission for files:
diff --git a/source3/smbd/error.c b/source3/smbd/error.c
index 17606c62be..913f2ac266 100644
--- a/source3/smbd/error.c
+++ b/source3/smbd/error.c
@@ -21,8 +21,6 @@
 
 #include "includes.h"
 
-extern int DEBUGLEVEL;
-
 /* these can be set by some functions to override the error codes */
 int unix_ERR_class=SMB_SUCCESS;
 int unix_ERR_code=0;
diff --git a/source3/smbd/fileio.c b/source3/smbd/fileio.c
index 003bee84ed..edf58d4a8e 100644
--- a/source3/smbd/fileio.c
+++ b/source3/smbd/fileio.c
@@ -21,8 +21,6 @@
 
 #include "includes.h"
 
-extern int DEBUGLEVEL;
-
 static BOOL setup_write_cache(files_struct *, SMB_OFF_T);
 
 /****************************************************************************
diff --git a/source3/smbd/filename.c b/source3/smbd/filename.c
index 17fa35c0d7..5fdbef44fe 100644
--- a/source3/smbd/filename.c
+++ b/source3/smbd/filename.c
@@ -27,7 +27,6 @@
 
 #include "includes.h"
 
-extern int DEBUGLEVEL;
 extern BOOL case_sensitive;
 extern BOOL case_preserve;
 extern BOOL short_case_preserve;
diff --git a/source3/smbd/files.c b/source3/smbd/files.c
index 4273c205cd..8c7fa930e1 100644
--- a/source3/smbd/files.c
+++ b/source3/smbd/files.c
@@ -21,8 +21,6 @@
 
 #include "includes.h"
 
-extern int DEBUGLEVEL;
-
 static int real_max_open_files;
 
 #define VALID_FNUM(fnum)   (((fnum) >= 0) && ((fnum) < real_max_open_files))
diff --git a/source3/smbd/groupname.c b/source3/smbd/groupname.c
index eb2931d2a5..7d3dce131a 100644
--- a/source3/smbd/groupname.c
+++ b/source3/smbd/groupname.c
@@ -22,10 +22,8 @@
 #ifdef USING_GROUPNAME_MAP
 
 #include "includes.h"
-extern int DEBUGLEVEL;
 extern DOM_SID global_sam_sid;
 
-
 /**************************************************************************
  Groupname map functionality. The code loads a groupname map file and
  (currently) loads it into a linked list. This is slow and memory
diff --git a/source3/smbd/ipc.c b/source3/smbd/ipc.c
index b1af01ff4c..93a69255c0 100644
--- a/source3/smbd/ipc.c
+++ b/source3/smbd/ipc.c
@@ -28,7 +28,6 @@
 
 #include "includes.h"
 
-extern int DEBUGLEVEL;
 extern int max_send;
 
 extern fstring local_machine;
diff --git a/source3/smbd/lanman.c b/source3/smbd/lanman.c
index b7acfa5f32..088162c126 100644
--- a/source3/smbd/lanman.c
+++ b/source3/smbd/lanman.c
@@ -33,8 +33,6 @@
 #endif
 #define CHECK_TYPES 0
 
-extern int DEBUGLEVEL;
-
 extern fstring local_machine;
 extern pstring global_myname;
 extern fstring global_myworkgroup;
diff --git a/source3/smbd/mangle.c b/source3/smbd/mangle.c
index ae0164e141..1c46afaea2 100644
--- a/source3/smbd/mangle.c
+++ b/source3/smbd/mangle.c
@@ -52,7 +52,6 @@
  * External Variables...
  */
 
-extern int DEBUGLEVEL;      /* Global debug level.                            */
 extern int case_default;    /* Are conforming 8.3 names all upper or lower?   */
 extern BOOL case_mangle;    /* If true, all chars in 8.3 should be same case. */
 
@@ -1540,4 +1539,3 @@ void mangle_test_code(void)
 }
 
 #endif /* TEST_MANGLE_CODE */
-
diff --git a/source3/smbd/message.c b/source3/smbd/message.c
index f2e88352ee..7cc53e082c 100644
--- a/source3/smbd/message.c
+++ b/source3/smbd/message.c
@@ -27,9 +27,6 @@
 #include "includes.h"
 
 /* look in server.c for some explanation of these variables */
-extern int DEBUGLEVEL;
-
-
 static char msgbuf[1600];
 static int msgpos;
 static fstring msgfrom;
diff --git a/source3/smbd/negprot.c b/source3/smbd/negprot.c
index 82222e6725..e3a6701dce 100644
--- a/source3/smbd/negprot.c
+++ b/source3/smbd/negprot.c
@@ -21,7 +21,6 @@
 
 #include "includes.h"
 
-extern int DEBUGLEVEL;
 extern int Protocol;
 extern int max_recv;
 extern fstring global_myworkgroup;
diff --git a/source3/smbd/notify.c b/source3/smbd/notify.c
index 68b51aeabb..999821354e 100644
--- a/source3/smbd/notify.c
+++ b/source3/smbd/notify.c
@@ -22,8 +22,6 @@
 
 #include "includes.h"
 
-extern int DEBUGLEVEL;
-
 static struct cnotify_fns *cnotify;
 
 /****************************************************************************
diff --git a/source3/smbd/notify_hash.c b/source3/smbd/notify_hash.c
index 8157e1ff31..0c69dc7876 100644
--- a/source3/smbd/notify_hash.c
+++ b/source3/smbd/notify_hash.c
@@ -22,9 +22,6 @@
 
 #include "includes.h"
 
-extern int DEBUGLEVEL;
-
-
 struct change_data {
 	time_t last_check_time; /* time we last checked this entry */
 	time_t modify_time; /* Info from the directory we're monitoring. */ 
diff --git a/source3/smbd/notify_kernel.c b/source3/smbd/notify_kernel.c
index 4b84831550..f618700bf0 100644
--- a/source3/smbd/notify_kernel.c
+++ b/source3/smbd/notify_kernel.c
@@ -23,7 +23,6 @@
 
 #if HAVE_KERNEL_CHANGE_NOTIFY
 
-extern int DEBUGLEVEL;
 static VOLATILE sig_atomic_t fd_pending;
 static VOLATILE sig_atomic_t signals_received;
 static VOLATILE sig_atomic_t signals_processed;
diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index c072a38474..2618a96913 100644
--- a/source3/smbd/nttrans.c
+++ b/source3/smbd/nttrans.c
@@ -21,7 +21,6 @@
 
 #include "includes.h"
 
-extern int DEBUGLEVEL;
 extern int Protocol;
 extern int smb_read_error;
 extern int global_oplock_break;
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 6e6d5e1e83..3578a82f8f 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -22,8 +22,6 @@
 
 #include "includes.h"
 
-extern int DEBUGLEVEL;
-
 extern userdom_struct current_user_info;
 extern uint16 global_oplock_port;
 extern BOOL global_client_failed_oplock_break;
diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c
index c17e63384f..4e8e36b3aa 100644
--- a/source3/smbd/oplock.c
+++ b/source3/smbd/oplock.c
@@ -21,8 +21,6 @@
 
 #include "includes.h"
 
-extern int DEBUGLEVEL;
-
 /* Oplock ipc UDP socket. */
 static int oplock_sock = -1;
 uint16 global_oplock_port = 0;
diff --git a/source3/smbd/oplock_irix.c b/source3/smbd/oplock_irix.c
index faf7e8e3c8..c6055fc329 100644
--- a/source3/smbd/oplock_irix.c
+++ b/source3/smbd/oplock_irix.c
@@ -22,7 +22,6 @@
 #include "includes.h"
 
 #if HAVE_KERNEL_OPLOCKS_IRIX
-extern int DEBUGLEVEL;
 
 static int oplock_pipe_write = -1;
 static int oplock_pipe_read = -1;
diff --git a/source3/smbd/oplock_linux.c b/source3/smbd/oplock_linux.c
index c88441c8c6..8c4259ac53 100644
--- a/source3/smbd/oplock_linux.c
+++ b/source3/smbd/oplock_linux.c
@@ -23,8 +23,6 @@
 
 #if HAVE_KERNEL_OPLOCKS_LINUX
 
-extern int DEBUGLEVEL;
-
 static VOLATILE sig_atomic_t signals_received;
 static VOLATILE sig_atomic_t signals_processed;
 static VOLATILE sig_atomic_t fd_pending; /* the fd of the current pending signal */
diff --git a/source3/smbd/password.c b/source3/smbd/password.c
index 6f5c7508a4..b074552567 100644
--- a/source3/smbd/password.c
+++ b/source3/smbd/password.c
@@ -21,7 +21,6 @@
 
 #include "includes.h"
 
-extern int DEBUGLEVEL;
 extern struct in_addr ipzero;
 
 /* users from session setup */
diff --git a/source3/smbd/pipes.c b/source3/smbd/pipes.c
index 162ad1603d..9a911ed014 100644
--- a/source3/smbd/pipes.c
+++ b/source3/smbd/pipes.c
@@ -31,8 +31,6 @@
 #define	PIPE		"\\PIPE\\"
 #define	PIPELEN		strlen(PIPE)
 
-extern int DEBUGLEVEL;
-
 extern struct pipe_id_info pipe_names[];
 
 /****************************************************************************
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index acda7128ae..4b0da0b466 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -21,8 +21,6 @@
 
 #include "includes.h"
 
-extern int DEBUGLEVEL;
-
 struct timeval smb_last_time;
 
 static char *InBuffer = NULL;
diff --git a/source3/smbd/quotas.c b/source3/smbd/quotas.c
index cf21fd7043..76d1124aea 100644
--- a/source3/smbd/quotas.c
+++ b/source3/smbd/quotas.c
@@ -28,8 +28,6 @@
 
 #include "includes.h"
 
-extern int DEBUGLEVEL;
-
 #if defined(VXFS_QUOTA)
 
 /*
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index dbd149afcf..334a48e338 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -29,7 +29,6 @@
 
 /* look in server.c for some explanation of these variables */
 extern int Protocol;
-extern int DEBUGLEVEL;
 extern int max_send;
 extern int max_recv;
 extern char magic_char;
diff --git a/source3/smbd/sec_ctx.c b/source3/smbd/sec_ctx.c
index 830e759d09..c053a611c2 100644
--- a/source3/smbd/sec_ctx.c
+++ b/source3/smbd/sec_ctx.c
@@ -21,7 +21,6 @@
 
 #include "includes.h"
 
-extern int DEBUGLEVEL;
 extern struct current_user current_user;
 
 struct sec_ctx {
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 1e89bbab7e..a851a8656d 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -34,8 +34,6 @@ int last_message = -1;
 /* a useful macro to debug the last message processed */
 #define LAST_MESSAGE() smb_fn_name(last_message)
 
-extern int DEBUGLEVEL;
-
 extern pstring user_socket_options;
 
 #ifdef WITH_DFS
diff --git a/source3/smbd/service.c b/source3/smbd/service.c
index 7119aa258e..69283d3bf5 100644
--- a/source3/smbd/service.c
+++ b/source3/smbd/service.c
@@ -21,8 +21,6 @@
 
 #include "includes.h"
 
-extern int DEBUGLEVEL;
-
 extern struct timeval smb_last_time;
 extern int case_default;
 extern BOOL case_preserve;
@@ -740,5 +738,3 @@ void close_cnum(connection_struct *conn, uint16 vuid)
 	}
 	conn_free(conn);
 }
-
-
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 139b97d088..0941d9f692 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -23,7 +23,6 @@
 
 #include "includes.h"
 
-extern int DEBUGLEVEL;
 extern int Protocol;
 extern BOOL case_sensitive;
 extern int smb_read_error;
diff --git a/source3/smbd/uid.c b/source3/smbd/uid.c
index 9fe634a7e9..6afaf1493e 100644
--- a/source3/smbd/uid.c
+++ b/source3/smbd/uid.c
@@ -21,8 +21,6 @@
 
 #include "includes.h"
 
-extern int DEBUGLEVEL;
-
 /* what user is current? */
 extern struct current_user current_user;
 
diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c
index 60762a0155..05645f7b19 100644
--- a/source3/smbd/vfs.c
+++ b/source3/smbd/vfs.c
@@ -21,8 +21,6 @@
 
 #include "includes.h"
 
-extern int DEBUGLEVEL;
-
 /* Some structures to help us initialise the vfs operations table */
 
 struct vfs_syminfo {
-- 
cgit