summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
Diffstat (limited to 'source3')
-rw-r--r--source3/auth/auth.c3
-rw-r--r--source3/auth/auth_domain.c2
-rw-r--r--source3/auth/auth_rhosts.c6
-rw-r--r--source3/auth/auth_sam.c5
-rw-r--r--source3/auth/auth_server.c4
-rw-r--r--source3/auth/auth_unix.c4
-rw-r--r--source3/auth/auth_util.c3
-rw-r--r--source3/auth/pampass.c2
-rw-r--r--source3/auth/pass_check.c5
-rw-r--r--source3/client/client.c1
-rw-r--r--source3/client/clitar.c1
-rw-r--r--source3/client/smbmount.c1
-rw-r--r--source3/groupdb/aliasdb.c2
-rw-r--r--source3/groupdb/aliasfile.c1
-rw-r--r--source3/groupdb/groupdb.c2
-rw-r--r--source3/groupdb/groupfile.c1
-rw-r--r--source3/groupdb/mapping.c1
-rw-r--r--source3/include/debug.h1
-rw-r--r--source3/lib/access.c2
-rw-r--r--source3/lib/bitmap.c3
-rw-r--r--source3/lib/charcnv.c2
-rw-r--r--source3/lib/cmd_interp.c3
-rw-r--r--source3/lib/crc32.c1
-rw-r--r--source3/lib/fault.c3
-rw-r--r--source3/lib/genrand.c3
-rw-r--r--source3/lib/hash.c2
-rw-r--r--source3/lib/interface.c2
-rw-r--r--source3/lib/netatalk.c3
-rw-r--r--source3/lib/pidfile.c3
-rw-r--r--source3/lib/replace.c3
-rw-r--r--source3/lib/smbrun.c2
-rw-r--r--source3/lib/substitute.c4
-rw-r--r--source3/lib/sysacls.c2
-rw-r--r--source3/lib/system.c2
-rw-r--r--source3/lib/time.c2
-rw-r--r--source3/lib/username.c1
-rw-r--r--source3/lib/util.c2
-rw-r--r--source3/lib/util_file.c2
-rw-r--r--source3/lib/util_seaccess.c2
-rw-r--r--source3/lib/util_sec.c1
-rw-r--r--source3/lib/util_sid.c2
-rw-r--r--source3/lib/util_sock.c3
-rw-r--r--source3/lib/util_str.c3
-rw-r--r--source3/lib/util_unistr.c3
-rw-r--r--source3/libsmb/clientgen.c4
-rw-r--r--source3/libsmb/clierror.c3
-rw-r--r--source3/libsmb/clioplock.c3
-rw-r--r--source3/libsmb/credentials.c4
-rw-r--r--source3/libsmb/domain_client_validate.c1
-rw-r--r--source3/libsmb/namequery.c2
-rw-r--r--source3/libsmb/nmblib.c4
-rw-r--r--source3/libsmb/pwd_cache.c3
-rw-r--r--source3/libsmb/smbencrypt.c3
-rw-r--r--source3/libsmb/smberr.c3
-rw-r--r--source3/libsmb/unexpected.c2
-rw-r--r--source3/locking/brlock.c2
-rw-r--r--source3/locking/locking.c1
-rw-r--r--source3/locking/posix.c1
-rw-r--r--source3/msdfs/msdfs.c3
-rw-r--r--source3/nmbd/asyncdns.c2
-rw-r--r--source3/nmbd/nmbd.c3
-rw-r--r--source3/nmbd/nmbd_become_dmb.c2
-rw-r--r--source3/nmbd/nmbd_become_lmb.c1
-rw-r--r--source3/nmbd/nmbd_browserdb.c2
-rw-r--r--source3/nmbd/nmbd_browsesync.c1
-rw-r--r--source3/nmbd/nmbd_elections.c2
-rw-r--r--source3/nmbd/nmbd_incomingdgrams.c2
-rw-r--r--source3/nmbd/nmbd_incomingrequests.c1
-rw-r--r--source3/nmbd/nmbd_lmhosts.c2
-rw-r--r--source3/nmbd/nmbd_logonnames.c2
-rw-r--r--source3/nmbd/nmbd_mynames.c2
-rw-r--r--source3/nmbd/nmbd_namelistdb.c2
-rw-r--r--source3/nmbd/nmbd_namequery.c1
-rw-r--r--source3/nmbd/nmbd_nameregister.c2
-rw-r--r--source3/nmbd/nmbd_namerelease.c2
-rw-r--r--source3/nmbd/nmbd_nodestatus.c2
-rw-r--r--source3/nmbd/nmbd_packets.c2
-rw-r--r--source3/nmbd/nmbd_processlogon.c2
-rw-r--r--source3/nmbd/nmbd_responserecordsdb.c2
-rw-r--r--source3/nmbd/nmbd_sendannounce.c1
-rw-r--r--source3/nmbd/nmbd_serverlistdb.c2
-rw-r--r--source3/nmbd/nmbd_subnetdb.c2
-rw-r--r--source3/nmbd/nmbd_synclists.c2
-rw-r--r--source3/nmbd/nmbd_winsproxy.c2
-rw-r--r--source3/nmbd/nmbd_winsserver.c2
-rw-r--r--source3/nmbd/nmbd_workgroupdb.c2
-rw-r--r--source3/nsswitch/winbindd.h4
-rw-r--r--source3/nsswitch/wins.c2
-rw-r--r--source3/param/params.c2
-rw-r--r--source3/passdb/ldap.c2
-rw-r--r--source3/passdb/pampass.c2
-rw-r--r--source3/passdb/pass_check.c5
-rw-r--r--source3/passdb/passdb.c2
-rw-r--r--source3/passdb/passgrp.c3
-rw-r--r--source3/passdb/pdb_ldap.c2
-rw-r--r--source3/passdb/pdb_smbpasswd.c2
-rw-r--r--source3/passdb/smbpassgroup.c1
-rw-r--r--source3/printing/lpq_parse.c2
-rw-r--r--source3/printing/nt_printing.c1
-rw-r--r--source3/printing/pcap.c2
-rw-r--r--source3/printing/print_cups.c3
-rw-r--r--source3/printing/print_generic.c2
-rw-r--r--source3/printing/print_svid.c2
-rw-r--r--source3/printing/printfsp.c2
-rw-r--r--source3/printing/printing.c2
-rw-r--r--source3/profile/profile.c3
-rw-r--r--source3/rpc_client/cli_connect.c2
-rw-r--r--source3/rpc_client/cli_login.c1
-rw-r--r--source3/rpc_client/cli_lsarpc.c2
-rw-r--r--source3/rpc_client/cli_netlogon.c1
-rw-r--r--source3/rpc_client/cli_pipe.c1
-rw-r--r--source3/rpc_client/cli_reg.c3
-rw-r--r--source3/rpc_client/cli_samr.c4
-rw-r--r--source3/rpc_client/cli_spoolss.c4
-rw-r--r--source3/rpc_client/cli_spoolss_notify.c2
-rw-r--r--source3/rpc_client/cli_srvsvc.c4
-rw-r--r--source3/rpc_client/cli_use.c1
-rw-r--r--source3/rpc_client/cli_wkssvc.c4
-rw-r--r--source3/rpc_client/msrpc_spoolss.c3
-rw-r--r--source3/rpc_client/ncacn_np_use.c5
-rw-r--r--source3/rpc_client/ntclienttrust.c4
-rw-r--r--source3/rpc_parse/parse_creds.c4
-rw-r--r--source3/rpc_parse/parse_dfs.c2
-rw-r--r--source3/rpc_parse/parse_lsa.c7
-rw-r--r--source3/rpc_parse/parse_misc.c3
-rw-r--r--source3/rpc_parse/parse_net.c2
-rw-r--r--source3/rpc_parse/parse_prs.c3
-rw-r--r--source3/rpc_parse/parse_reg.c5
-rw-r--r--source3/rpc_parse/parse_rpc.c5
-rw-r--r--source3/rpc_parse/parse_samr.c2
-rw-r--r--source3/rpc_parse/parse_sec.c2
-rw-r--r--source3/rpc_parse/parse_spoolss.c2
-rw-r--r--source3/rpc_parse/parse_srv.c3
-rw-r--r--source3/rpc_parse/parse_wks.c4
-rw-r--r--source3/rpc_server/srv_dfs.c2
-rw-r--r--source3/rpc_server/srv_dfs_nt.c1
-rw-r--r--source3/rpc_server/srv_lsa.c2
-rw-r--r--source3/rpc_server/srv_lsa_hnd.c2
-rw-r--r--source3/rpc_server/srv_lsa_nt.c1
-rw-r--r--source3/rpc_server/srv_netlog.c2
-rw-r--r--source3/rpc_server/srv_netlog_nt.c2
-rw-r--r--source3/rpc_server/srv_pipe.c2
-rw-r--r--source3/rpc_server/srv_pipe_hnd.c3
-rw-r--r--source3/rpc_server/srv_reg.c2
-rw-r--r--source3/rpc_server/srv_reg_nt.c2
-rw-r--r--source3/rpc_server/srv_samr.c2
-rw-r--r--source3/rpc_server/srv_samr_nt.c2
-rwxr-xr-xsource3/rpc_server/srv_spoolss.c2
-rw-r--r--source3/rpc_server/srv_spoolss_nt.c1
-rw-r--r--source3/rpc_server/srv_srvsvc.c2
-rw-r--r--source3/rpc_server/srv_srvsvc_nt.c1
-rw-r--r--source3/rpc_server/srv_util.c2
-rw-r--r--source3/rpc_server/srv_wkssvc.c2
-rw-r--r--source3/rpc_server/srv_wkssvc_nt.c1
-rw-r--r--source3/rpcclient/cmd_dfs.c1
-rw-r--r--source3/rpcclient/cmd_lsarpc.c1
-rw-r--r--source3/rpcclient/cmd_netlogon.c2
-rw-r--r--source3/rpcclient/cmd_reg.c5
-rw-r--r--source3/rpcclient/cmd_spoolss.c2
-rw-r--r--source3/rpcclient/cmd_srvsvc.c2
-rw-r--r--source3/rpcclient/cmd_wkssvc.c3
-rw-r--r--source3/rpcclient/rpcclient.c1
-rw-r--r--source3/rpcclient/samsync.c2
-rw-r--r--source3/smbd/auth.c3
-rw-r--r--source3/smbd/auth_domain.c2
-rw-r--r--source3/smbd/auth_rhosts.c6
-rw-r--r--source3/smbd/auth_server.c4
-rw-r--r--source3/smbd/auth_smbpasswd.c5
-rw-r--r--source3/smbd/auth_unix.c4
-rw-r--r--source3/smbd/auth_util.c3
-rw-r--r--source3/smbd/blocking.c2
-rw-r--r--source3/smbd/chgpasswd.c1
-rw-r--r--source3/smbd/close.c2
-rw-r--r--source3/smbd/conn.c2
-rw-r--r--source3/smbd/connection.c3
-rw-r--r--source3/smbd/dfree.c3
-rw-r--r--source3/smbd/dir.c2
-rw-r--r--source3/smbd/dosmode.c2
-rw-r--r--source3/smbd/error.c2
-rw-r--r--source3/smbd/fileio.c2
-rw-r--r--source3/smbd/filename.c1
-rw-r--r--source3/smbd/files.c2
-rw-r--r--source3/smbd/groupname.c2
-rw-r--r--source3/smbd/ipc.c1
-rw-r--r--source3/smbd/lanman.c2
-rw-r--r--source3/smbd/mangle.c2
-rw-r--r--source3/smbd/message.c3
-rw-r--r--source3/smbd/negprot.c1
-rw-r--r--source3/smbd/notify.c2
-rw-r--r--source3/smbd/notify_hash.c3
-rw-r--r--source3/smbd/notify_kernel.c1
-rw-r--r--source3/smbd/nttrans.c1
-rw-r--r--source3/smbd/open.c2
-rw-r--r--source3/smbd/oplock.c2
-rw-r--r--source3/smbd/oplock_irix.c1
-rw-r--r--source3/smbd/oplock_linux.c2
-rw-r--r--source3/smbd/password.c1
-rw-r--r--source3/smbd/pipes.c2
-rw-r--r--source3/smbd/process.c2
-rw-r--r--source3/smbd/quotas.c2
-rw-r--r--source3/smbd/reply.c1
-rw-r--r--source3/smbd/sec_ctx.c1
-rw-r--r--source3/smbd/server.c2
-rw-r--r--source3/smbd/service.c4
-rw-r--r--source3/smbd/trans2.c1
-rw-r--r--source3/smbd/uid.c2
-rw-r--r--source3/smbd/vfs.c2
-rw-r--r--source3/smbwrapper/shared.c2
-rw-r--r--source3/smbwrapper/smbw.c1
-rw-r--r--source3/smbwrapper/smbw_dir.c2
-rw-r--r--source3/smbwrapper/smbw_stat.c3
-rw-r--r--source3/torture/masktest.c1
-rw-r--r--source3/torture/rpctorture.c2
-rw-r--r--source3/utils/nmblookup.c2
-rw-r--r--source3/utils/pdbedit.c1
-rw-r--r--source3/utils/rpccheck.c2
-rw-r--r--source3/utils/smbfilter.c2
-rw-r--r--source3/utils/smbgroupedit.c3
-rw-r--r--source3/utils/smbpasswd.c1
-rw-r--r--source3/utils/status.c3
-rw-r--r--source3/utils/testparm.c3
-rw-r--r--source3/utils/testprns.c4
222 files changed, 3 insertions, 506 deletions
diff --git a/source3/auth/auth.c b/source3/auth/auth.c
index 6aa2714b0b..e76324213e 100644
--- a/source3/auth/auth.c
+++ b/source3/auth/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/auth/auth_domain.c b/source3/auth/auth_domain.c
index 111f0f143c..bcd41bacdb 100644
--- a/source3/auth/auth_domain.c
+++ b/source3/auth/auth_domain.c
@@ -22,8 +22,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
-
BOOL global_machine_password_needs_changing = False;
/****************************************************************************
diff --git a/source3/auth/auth_rhosts.c b/source3/auth/auth_rhosts.c
index e319d8d5f8..cd1bf57f86 100644
--- a/source3/auth/auth_rhosts.c
+++ b/source3/auth/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/auth/auth_sam.c b/source3/auth/auth_sam.c
index 835ade739f..da223368b8 100644
--- a/source3/auth/auth_sam.c
+++ b/source3/auth/auth_sam.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/auth/auth_server.c b/source3/auth/auth_server.c
index e4c91c4dcb..2574a52ef3 100644
--- a/source3/auth/auth_server.c
+++ b/source3/auth/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/auth/auth_unix.c b/source3/auth/auth_unix.c
index 0d73988d8a..2f9034e3e5 100644
--- a/source3/auth/auth_unix.c
+++ b/source3/auth/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/auth/auth_util.c b/source3/auth/auth_util.c
index 1967c32b9a..d3b9aa7001 100644
--- a/source3/auth/auth_util.c
+++ b/source3/auth/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/auth/pampass.c b/source3/auth/pampass.c
index 116ecaf95b..6d0dabcd9d 100644
--- a/source3/auth/pampass.c
+++ b/source3/auth/pampass.c
@@ -30,8 +30,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
-
#ifdef WITH_PAM
/*******************************************************************
diff --git a/source3/auth/pass_check.c b/source3/auth/pass_check.c
index 594983e53b..a57cb2ff06 100644
--- a/source3/auth/pass_check.c
+++ b/source3/auth/pass_check.c
@@ -24,8 +24,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
-
/* these are kept here to keep the string_combinations function simple */
static fstring this_user;
#if !(defined(WITH_PAM) || defined(KRB4_AUTH) || defined(KRB5_AUTH))
@@ -896,6 +894,3 @@ NTSTATUS pass_check(struct passwd *pass, char *user, char *password,
return NT_STATUS_WRONG_PASSWORD;
}
-
-
-
diff --git a/source3/client/client.c b/source3/client/client.c
index 448f4314c8..67b370901f 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -61,7 +61,6 @@ time_t newer_than = 0;
int archive_level = 0;
extern pstring debugf;
-extern int DEBUGLEVEL;
BOOL translation = False;
diff --git a/source3/client/clitar.c b/source3/client/clitar.c
index 39c31625b4..f2f373ffba 100644
--- a/source3/client/clitar.c
+++ b/source3/client/clitar.c
@@ -69,7 +69,6 @@ typedef struct
stack dir_stack = {NULL, 0}; /* Want an empty stack */
#define SEPARATORS " \t\n\r"
-extern int DEBUGLEVEL;
extern struct cli_state *cli;
/* These defines are for the do_setrattr routine, to indicate
diff --git a/source3/client/smbmount.c b/source3/client/smbmount.c
index 56a1443722..27f33db92d 100644
--- a/source3/client/smbmount.c
+++ b/source3/client/smbmount.c
@@ -28,7 +28,6 @@
#include <linux/smb_fs.h>
extern struct in_addr ipzero;
-extern int DEBUGLEVEL;
extern BOOL in_client;
extern pstring user_socket_options;
diff --git a/source3/groupdb/aliasdb.c b/source3/groupdb/aliasdb.c
index 2c96e92ee1..62513b2e33 100644
--- a/source3/groupdb/aliasdb.c
+++ b/source3/groupdb/aliasdb.c
@@ -22,8 +22,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
-
extern fstring global_sam_name;
/*
diff --git a/source3/groupdb/aliasfile.c b/source3/groupdb/aliasfile.c
index 7f07192c74..21c8a1a500 100644
--- a/source3/groupdb/aliasfile.c
+++ b/source3/groupdb/aliasfile.c
@@ -22,7 +22,6 @@
#ifdef USE_SMBPASS_DB
static int al_file_lock_depth = 0;
-extern int DEBUGLEVEL;
static char s_readbuf[1024];
diff --git a/source3/groupdb/groupdb.c b/source3/groupdb/groupdb.c
index 8b29a32423..69b4137472 100644
--- a/source3/groupdb/groupdb.c
+++ b/source3/groupdb/groupdb.c
@@ -22,8 +22,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
-
/*
* NOTE. All these functions are abstracted into a structure
* that points to the correct function for the selected database. JRA.
diff --git a/source3/groupdb/groupfile.c b/source3/groupdb/groupfile.c
index f47eee555f..557ae92530 100644
--- a/source3/groupdb/groupfile.c
+++ b/source3/groupdb/groupfile.c
@@ -22,7 +22,6 @@
#ifdef USE_SMBPASS_DB
static int gp_file_lock_depth = 0;
-extern int DEBUGLEVEL;
static char s_readbuf[1024];
diff --git a/source3/groupdb/mapping.c b/source3/groupdb/mapping.c
index a6a63cbc2a..5173132af8 100644
--- a/source3/groupdb/mapping.c
+++ b/source3/groupdb/mapping.c
@@ -22,7 +22,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
extern DOM_SID global_sam_sid;
static TDB_CONTEXT *tdb; /* used for driver files */
diff --git a/source3/include/debug.h b/source3/include/debug.h
index b726859a0b..cad802d8ca 100644
--- a/source3/include/debug.h
+++ b/source3/include/debug.h
@@ -41,7 +41,6 @@ int Debug1( char *, ... ) PRINTF_ATTRIBUTE(1,2);
BOOL dbgtext( char *, ... ) PRINTF_ATTRIBUTE(1,2);
extern XFILE *dbf;
-extern int DEBUGLEVEL;
/* If we have these macros, we can add additional info to the header. */
#ifdef HAVE_FILE_MACRO
diff --git a/source3/lib/access.c b/source3/lib/access.c
index b3d1838484..ff929d3549 100644
--- a/source3/lib/access.c
+++ b/source3/lib/access.c
@@ -10,8 +10,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
-
#define FAIL (-1)
/* masked_match - match address against netnumber/netmask */
diff --git a/source3/lib/bitmap.c b/source3/lib/bitmap.c
index 2ae9defb2d..b130467b22 100644
--- a/source3/lib/bitmap.c
+++ b/source3/lib/bitmap.c
@@ -21,12 +21,9 @@
#include "includes.h"
-extern int DEBUGLEVEL;
-
/* these functions provide a simple way to allocate integers from a
pool without repitition */
-
/****************************************************************************
allocate a bitmap of the specified size
****************************************************************************/
diff --git a/source3/lib/charcnv.c b/source3/lib/charcnv.c
index 55d56acf59..45d7d4d8d5 100644
--- a/source3/lib/charcnv.c
+++ b/source3/lib/charcnv.c
@@ -22,8 +22,6 @@
*/
#include "includes.h"
-extern int DEBUGLEVEL;
-
static pstring cvtbuf;
static smb_iconv_t conv_handles[NUM_CHARSETS][NUM_CHARSETS];
diff --git a/source3/lib/cmd_interp.c b/source3/lib/cmd_interp.c
index 5ebb8a94d2..54d023e9f7 100644
--- a/source3/lib/cmd_interp.c
+++ b/source3/lib/cmd_interp.c
@@ -41,9 +41,6 @@ extern pstring user_socket_options;
extern struct user_creds *usr_creds;
-extern int DEBUGLEVEL;
-
-
#define CNV_LANG(s) dos2unix_format(s,False)
#define CNV_INPUT(s) unix2dos_format(s,True)
diff --git a/source3/lib/crc32.c b/source3/lib/crc32.c
index 16b337c764..e026fbf861 100644
--- a/source3/lib/crc32.c
+++ b/source3/lib/crc32.c
@@ -7,7 +7,6 @@
*/
#include "includes.h"
-extern int DEBUGLEVEL;
static unsigned long CRCTable[256] =
{
diff --git a/source3/lib/fault.c b/source3/lib/fault.c
index 29272f1928..885e35e023 100644
--- a/source3/lib/fault.c
+++ b/source3/lib/fault.c
@@ -20,12 +20,9 @@
*/
#include "includes.h"
-extern int DEBUGLEVEL;
-
static void (*cont_fn)(void *);
-
/*******************************************************************
report a fault
********************************************************************/
diff --git a/source3/lib/genrand.c b/source3/lib/genrand.c
index c4fb925a75..39e56db960 100644
--- a/source3/lib/genrand.c
+++ b/source3/lib/genrand.c
@@ -23,9 +23,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
-
-
static unsigned char hash[258];
static uint32 counter;
unsigned char *reseed_data;
diff --git a/source3/lib/hash.c b/source3/lib/hash.c
index 3abdc2ef11..68c334a8ca 100644
--- a/source3/lib/hash.c
+++ b/source3/lib/hash.c
@@ -28,8 +28,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
-
static BOOL enlarge_hash_table(hash_table *table);
static int primes[] =
{17, 37, 67, 131, 257, 521, 1031, 2053, 4099, 8209, 16411};
diff --git a/source3/lib/interface.c b/source3/lib/interface.c
index c68b405f7c..70ffcb0e1d 100644
--- a/source3/lib/interface.c
+++ b/source3/lib/interface.c
@@ -26,8 +26,6 @@
static struct iface_struct *probed_ifaces;
static int total_probed;
-extern int DEBUGLEVEL;
-
struct in_addr ipzero;
struct in_addr allones_ip;
struct in_addr loopback_ip;
diff --git a/source3/lib/netatalk.c b/source3/lib/netatalk.c
index ae0a57154e..654d3f78d4 100644
--- a/source3/lib/netatalk.c
+++ b/source3/lib/netatalk.c
@@ -28,8 +28,6 @@
#ifdef WITH_NETATALK
-extern int DEBUGLEVEL;
-
/*****************
ntalk_resourcepath: creates the path to the netatalk resource fork for
a given file
@@ -155,5 +153,4 @@ int ntalk_chmod(const char *fname, mode_t perms)
return chmod(fname, perms);
}
-
#endif /* WITH_NETATALK */
diff --git a/source3/lib/pidfile.c b/source3/lib/pidfile.c
index a26aa12a3c..a9b2da0d7f 100644
--- a/source3/lib/pidfile.c
+++ b/source3/lib/pidfile.c
@@ -23,9 +23,6 @@
#include "includes.h"
-
-extern int DEBUGLEVEL;
-
#ifndef O_NONBLOCK
#define O_NONBLOCK
#endif
diff --git a/source3/lib/replace.c b/source3/lib/replace.c
index e1871a6f55..b972c745b0 100644
--- a/source3/lib/replace.c
+++ b/source3/lib/replace.c
@@ -21,12 +21,9 @@
#include "includes.h"
-extern int DEBUGLEVEL;
-
void replace_dummy(void);
void replace_dummy(void) {}
-
#ifndef HAVE_FTRUNCATE
/*******************************************************************
ftruncate for operating systems that don't have it
diff --git a/source3/lib/smbrun.c b/source3/lib/smbrun.c
index 62378503e0..1ace6e3a99 100644
--- a/source3/lib/smbrun.c
+++ b/source3/lib/smbrun.c
@@ -24,8 +24,6 @@
/* need to move this from here!! need some sleep ... */
struct current_user current_user;
-extern int DEBUGLEVEL;
-
/****************************************************************************
This is a utility function of smbrun().
****************************************************************************/
diff --git a/source3/lib/substitute.c b/source3/lib/substitute.c
index 7f597d37f2..71bd8c777e 100644
--- a/source3/lib/substitute.c
+++ b/source3/lib/substitute.c
@@ -22,8 +22,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
-
fstring local_machine="";
fstring remote_arch="UNKNOWN";
userdom_struct current_user_info;
@@ -32,7 +30,6 @@ BOOL sam_logon_in_ssb = False;
fstring remote_proto="UNKNOWN";
fstring remote_machine="";
-
/*******************************************************************
Given a pointer to a %$(NAME) expand it as an environment variable.
Return the number of characters by which the pointer should be advanced.
@@ -318,4 +315,3 @@ void standard_sub_vsnum(char *str, user_struct *vuser, int snum)
{
standard_sub_advanced(snum, vuser->user.unix_name, "", -1, str);
}
-
diff --git a/source3/lib/sysacls.c b/source3/lib/sysacls.c
index 1c840d84ca..c618fbe0e8 100644
--- a/source3/lib/sysacls.c
+++ b/source3/lib/sysacls.c
@@ -21,8 +21,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
-
/*
This file wraps all differing system ACL interfaces into a consistent
one based on the POSIX interface. It also returns the correct errors
diff --git a/source3/lib/system.c b/source3/lib/system.c
index 822aeb9004..4114ce456c 100644
--- a/source3/lib/system.c
+++ b/source3/lib/system.c
@@ -21,8 +21,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
-
/*
The idea is that this file will eventually have wrappers around all
important system calls in samba. The aims are:
diff --git a/source3/lib/time.c b/source3/lib/time.c
index f5cd96223c..59106386d4 100644
--- a/source3/lib/time.c
+++ b/source3/lib/time.c
@@ -30,8 +30,6 @@
int serverzone=0;
int extra_time_offset = 0;
-extern int DEBUGLEVEL;
-
#ifndef CHAR_BIT
#define CHAR_BIT 8
#endif
diff --git a/source3/lib/username.c b/source3/lib/username.c
index 2af477577e..24195b196b 100644
--- a/source3/lib/username.c
+++ b/source3/lib/username.c
@@ -20,7 +20,6 @@
*/
#include "includes.h"
-extern int DEBUGLEVEL;
/* internal functions */
static struct passwd *uname_string_combinations(char *s, struct passwd * (*fn) (char *), int N);
diff --git a/source3/lib/util.c b/source3/lib/util.c
index fe3e10e6b5..7fbdb44b4a 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -58,8 +58,6 @@ extern SSL *ssl;
extern int sslFd;
#endif /* WITH_SSL */
-extern int DEBUGLEVEL;
-
int Protocol = PROTOCOL_COREPLUS;
/* a default finfo structure to ensure all fields are sensible */
diff --git a/source3/lib/util_file.c b/source3/lib/util_file.c
index 1d7b85f75c..3d072bb170 100644
--- a/source3/lib/util_file.c
+++ b/source3/lib/util_file.c
@@ -19,8 +19,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
-
static int gotalarm;
/***************************************************************
diff --git a/source3/lib/util_seaccess.c b/source3/lib/util_seaccess.c
index ec1b56ae86..82fb1e8527 100644
--- a/source3/lib/util_seaccess.c
+++ b/source3/lib/util_seaccess.c
@@ -24,8 +24,6 @@
#include "nterr.h"
#include "sids.h"
-extern int DEBUGLEVEL;
-
/**********************************************************************************
Check if this ACE has a SID in common with the token.
**********************************************************************************/
diff --git a/source3/lib/util_sec.c b/source3/lib/util_sec.c
index 231f0b178d..a07e7d0e1a 100644
--- a/source3/lib/util_sec.c
+++ b/source3/lib/util_sec.c
@@ -21,7 +21,6 @@
#ifndef AUTOCONF_TEST
#include "includes.h"
-extern int DEBUGLEVEL;
#else
/* we are running this code in autoconf test mode to see which type of setuid
function works */
diff --git a/source3/lib/util_sid.c b/source3/lib/util_sid.c
index 10813a4605..8903bb1465 100644
--- a/source3/lib/util_sid.c
+++ b/source3/lib/util_sid.c
@@ -23,8 +23,6 @@
#include "includes.h"
-
-extern int DEBUGLEVEL;
DOM_SID global_sam_sid;
extern pstring global_myname;
extern fstring global_myworkgroup;
diff --git a/source3/lib/util_sock.c b/source3/lib/util_sock.c
index e1f291386e..5979cd8b5a 100644
--- a/source3/lib/util_sock.c
+++ b/source3/lib/util_sock.c
@@ -28,8 +28,6 @@ extern SSL *ssl;
extern int sslFd;
#endif /* WITH_SSL */
-extern int DEBUGLEVEL;
-
/* the last IP received from */
struct in_addr lastip;
@@ -1243,4 +1241,3 @@ int sock_exec(const char *prog)
close(fd[1]);
return fd[0];
}
-
diff --git a/source3/lib/util_str.c b/source3/lib/util_str.c
index 8518d75a49..0e7a7c02f5 100644
--- a/source3/lib/util_str.c
+++ b/source3/lib/util_str.c
@@ -21,8 +21,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
-
/****************************************************************************
Get the next token from a string, return False if none found
handles double-quotes.
@@ -855,4 +853,3 @@ void strupper_m(char *s)
* as source string even in multibyte encoding. (VIV) */
unix_strupper(s,strlen(s)+1,s,strlen(s)+1);
}
-
diff --git a/source3/lib/util_unistr.c b/source3/lib/util_unistr.c
index 887c15f0d9..1054eab6e1 100644
--- a/source3/lib/util_unistr.c
+++ b/source3/lib/util_unistr.c
@@ -21,8 +21,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
-
#ifndef MAXUNI
#define MAXUNI 1024
#endif
@@ -453,4 +451,3 @@ smb_ucs2_t *strncat_wa(smb_ucs2_t *dest, const char *src, const size_t max)
SAFE_FREE(ucs2_src);
return dest;
}
-
diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c
index 79757947b4..62b46a7904 100644
--- a/source3/libsmb/clientgen.c
+++ b/source3/libsmb/clientgen.c
@@ -23,9 +23,6 @@
#include "includes.h"
-
-extern int DEBUGLEVEL;
-
/*
* Change the port number used to call on
*/
@@ -248,4 +245,3 @@ uint16 cli_setpid(struct cli_state *cli, uint16 pid)
cli->pid = pid;
return ret;
}
-
diff --git a/source3/libsmb/clierror.c b/source3/libsmb/clierror.c
index 5bc3992944..bcecc92d77 100644
--- a/source3/libsmb/clierror.c
+++ b/source3/libsmb/clierror.c
@@ -23,8 +23,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
-
/*****************************************************
RAP error codes - a small start but will be extended.
*******************************************************/
@@ -267,4 +265,3 @@ BOOL cli_is_dos_error(struct cli_state *cli)
return cli_is_error(cli) && !(flgs2 & FLAGS2_32_BIT_ERROR_CODES);
}
-
diff --git a/source3/libsmb/clioplock.c b/source3/libsmb/clioplock.c
index a52dcf3a3e..b38933181e 100644
--- a/source3/libsmb/clioplock.c
+++ b/source3/libsmb/clioplock.c
@@ -22,8 +22,6 @@
#define NO_SYSLOG
#include "includes.h"
-extern int DEBUGLEVEL;
-
/****************************************************************************
send an ack for an oplock break request
@@ -69,4 +67,3 @@ void cli_oplock_handler(struct cli_state *cli,
{
cli->oplock_handler = handler;
}
-
diff --git a/source3/libsmb/credentials.c b/source3/libsmb/credentials.c
index d4c8792068..5f65c13edd 100644
--- a/source3/libsmb/credentials.c
+++ b/source3/libsmb/credentials.c
@@ -21,10 +21,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
-
-
-
/****************************************************************************
represent a credential as a string
****************************************************************************/
diff --git a/source3/libsmb/domain_client_validate.c b/source3/libsmb/domain_client_validate.c
index 5a8ae372ea..255b37883d 100644
--- a/source3/libsmb/domain_client_validate.c
+++ b/source3/libsmb/domain_client_validate.c
@@ -22,7 +22,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
extern struct in_addr ipzero;
extern pstring global_myname;
diff --git a/source3/libsmb/namequery.c b/source3/libsmb/namequery.c
index b82e98b0fc..0dbf4b4564 100644
--- a/source3/libsmb/namequery.c
+++ b/source3/libsmb/namequery.c
@@ -22,8 +22,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
-
/* nmbd.c sets this to True. */
BOOL global_in_nmbd = False;
diff --git a/source3/libsmb/nmblib.c b/source3/libsmb/nmblib.c
index 4ecc887524..d7bd7b49a0 100644
--- a/source3/libsmb/nmblib.c
+++ b/source3/libsmb/nmblib.c
@@ -22,8 +22,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
-
int num_good_sends = 0;
int num_good_receives = 0;
@@ -1269,5 +1267,3 @@ int name_len(char *s1)
return(len);
} /* name_len */
-
-
diff --git a/source3/libsmb/pwd_cache.c b/source3/libsmb/pwd_cache.c
index 37a07a0001..64e23e0feb 100644
--- a/source3/libsmb/pwd_cache.c
+++ b/source3/libsmb/pwd_cache.c
@@ -21,9 +21,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
-
-
/****************************************************************************
initialises a password structure
****************************************************************************/
diff --git a/source3/libsmb/smbencrypt.c b/source3/libsmb/smbencrypt.c
index b1a5c9fbb8..4b127051b4 100644
--- a/source3/libsmb/smbencrypt.c
+++ b/source3/libsmb/smbencrypt.c
@@ -23,9 +23,6 @@
*/
#include "includes.h"
-
-extern int DEBUGLEVEL;
-
#include "byteorder.h"
/*
diff --git a/source3/libsmb/smberr.c b/source3/libsmb/smberr.c
index c881b54203..0b59b5b1a5 100644
--- a/source3/libsmb/smberr.c
+++ b/source3/libsmb/smberr.c
@@ -22,8 +22,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
-
/* error code stuff - put together by Merik Karman
merik@blackadder.dsh.oz.au */
@@ -200,4 +198,3 @@ WERROR map_werror_from_unix(int error)
NTSTATUS status = map_nt_error_from_unix(error);
return ntstatus_to_werror(status);
}
-
diff --git a/source3/libsmb/unexpected.c b/source3/libsmb/unexpected.c
index 7d221e173e..b77e7490a0 100644
--- a/source3/libsmb/unexpected.c
+++ b/source3/libsmb/unexpected.c
@@ -22,8 +22,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
-
static TDB_CONTEXT *tdbd = NULL;
/* the key type used in the unexpeceted packet database */
diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c
index b16cc539c8..cbf98c46a5 100644
--- a/source3/locking/brlock.c
+++ b/source3/locking/brlock.c
@@ -28,8 +28,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
-
#define ZERO_ZERO 0
/* This contains elements that differentiate locks. The smbpid is a
diff --git a/source3/locking/locking.c b/source3/locking/locking.c
index db0de5bb3f..70995da3e2 100644
--- a/source3/locking/locking.c
+++ b/source3/locking/locking.c
@@ -36,7 +36,6 @@
*/
#include "includes.h"
-extern int DEBUGLEVEL;
uint16 global_smbpid;
/* the locking database handle */
diff --git a/source3/locking/posix.c b/source3/locking/posix.c
index 8fbe2e2fda..8b3538d8ca 100644
--- a/source3/locking/posix.c
+++ b/source3/locking/posix.c
@@ -24,7 +24,6 @@
*/
#include "includes.h"
-extern int DEBUGLEVEL;
/*
* The POSIX locking database handle.
diff --git a/source3/msdfs/msdfs.c b/source3/msdfs/msdfs.c
index 5aaca4ef34..5953da1843 100644
--- a/source3/msdfs/msdfs.c
+++ b/source3/msdfs/msdfs.c
@@ -21,7 +21,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
extern pstring global_myname;
/**********************************************************************
@@ -737,5 +736,3 @@ int enum_msdfs_links(struct junction_map* jn)
}
return jn_count;
}
-
-
diff --git a/source3/nmbd/asyncdns.c b/source3/nmbd/asyncdns.c
index 1fe04a39e3..5ae2eb202d 100644
--- a/source3/nmbd/asyncdns.c
+++ b/source3/nmbd/asyncdns.c
@@ -20,8 +20,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
-
/***************************************************************************
Add a DNS result to the name cache.
****************************************************************************/
diff --git a/source3/nmbd/nmbd.c b/source3/nmbd/nmbd.c
index 6fead637eb..3c93f306b8 100644
--- a/source3/nmbd/nmbd.c
+++ b/source3/nmbd/nmbd.c
@@ -27,8 +27,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
-
extern pstring debugf;
pstring servicesf = CONFIGFILE;
@@ -878,4 +876,3 @@ static void usage(char *pname)
x_fclose(dbf);
return(0);
} /* main */
-
diff --git a/source3/nmbd/nmbd_become_dmb.c b/source3/nmbd/nmbd_become_dmb.c
index 089aa8f16a..8a9fbaedd5 100644
--- a/source3/nmbd/nmbd_become_dmb.c
+++ b/source3/nmbd/nmbd_become_dmb.c
@@ -24,8 +24,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
-
extern pstring global_myname;
extern fstring global_myworkgroup;
extern char **my_netbios_names;
diff --git a/source3/nmbd/nmbd_become_lmb.c b/source3/nmbd/nmbd_become_lmb.c
index 31c67ae7f3..52955d9bfc 100644
--- a/source3/nmbd/nmbd_become_lmb.c
+++ b/source3/nmbd/nmbd_become_lmb.c
@@ -24,7 +24,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
extern pstring global_myname;
extern uint16 samba_nb_type; /* Samba's NetBIOS name type. */
diff --git a/source3/nmbd/nmbd_browserdb.c b/source3/nmbd/nmbd_browserdb.c
index 9523152840..cbf871a700 100644
--- a/source3/nmbd/nmbd_browserdb.c
+++ b/source3/nmbd/nmbd_browserdb.c
@@ -30,8 +30,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
-
/* -------------------------------------------------------------------------- **
* Variables...
*
diff --git a/source3/nmbd/nmbd_browsesync.c b/source3/nmbd/nmbd_browsesync.c
index 23ca0a398f..6a8edd0eaf 100644
--- a/source3/nmbd/nmbd_browsesync.c
+++ b/source3/nmbd/nmbd_browsesync.c
@@ -25,7 +25,6 @@
#include "includes.h"
#include "smb.h"
-extern int DEBUGLEVEL;
extern struct in_addr ipzero;
extern pstring global_myname;
extern fstring global_myworkgroup;
diff --git a/source3/nmbd/nmbd_elections.c b/source3/nmbd/nmbd_elections.c
index 0fc3ab9a89..6db595269f 100644
--- a/source3/nmbd/nmbd_elections.c
+++ b/source3/nmbd/nmbd_elections.c
@@ -24,8 +24,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
-
extern pstring global_myname;
extern fstring global_myworkgroup;
diff --git a/source3/nmbd/nmbd_incomingdgrams.c b/source3/nmbd/nmbd_incomingdgrams.c
index eaafd63f1a..d10e6ec0b0 100644
--- a/source3/nmbd/nmbd_incomingdgrams.c
+++ b/source3/nmbd/nmbd_incomingdgrams.c
@@ -24,8 +24,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
-
extern pstring global_myname;
extern fstring global_myworkgroup;
extern BOOL found_lm_clients;
diff --git a/source3/nmbd/nmbd_incomingrequests.c b/source3/nmbd/nmbd_incomingrequests.c
index b390755be5..81e6bb9629 100644
--- a/source3/nmbd/nmbd_incomingrequests.c
+++ b/source3/nmbd/nmbd_incomingrequests.c
@@ -28,7 +28,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
extern fstring global_myworkgroup;
/****************************************************************************
diff --git a/source3/nmbd/nmbd_lmhosts.c b/source3/nmbd/nmbd_lmhosts.c
index 04ab280784..4d819b41e9 100644
--- a/source3/nmbd/nmbd_lmhosts.c
+++ b/source3/nmbd/nmbd_lmhosts.c
@@ -26,8 +26,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
-
/****************************************************************************
Load a lmhosts file.
****************************************************************************/
diff --git a/source3/nmbd/nmbd_logonnames.c b/source3/nmbd/nmbd_logonnames.c
index c63de56a34..4f48b21b7f 100644
--- a/source3/nmbd/nmbd_logonnames.c
+++ b/source3/nmbd/nmbd_logonnames.c
@@ -24,8 +24,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
-
extern pstring global_myname;
extern fstring global_myworkgroup;
extern char **my_netbios_names;
diff --git a/source3/nmbd/nmbd_mynames.c b/source3/nmbd/nmbd_mynames.c
index 432a4736a4..47655c804b 100644
--- a/source3/nmbd/nmbd_mynames.c
+++ b/source3/nmbd/nmbd_mynames.c
@@ -24,8 +24,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
-
extern char **my_netbios_names;
extern fstring global_myworkgroup;
diff --git a/source3/nmbd/nmbd_namelistdb.c b/source3/nmbd/nmbd_namelistdb.c
index fe2c0c0f21..aa9589e45a 100644
--- a/source3/nmbd/nmbd_namelistdb.c
+++ b/source3/nmbd/nmbd_namelistdb.c
@@ -24,8 +24,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
-
extern char **my_netbios_names;
uint16 samba_nb_type = 0; /* samba's NetBIOS name type */
diff --git a/source3/nmbd/nmbd_namequery.c b/source3/nmbd/nmbd_namequery.c
index b497526475..1f0895ee37 100644
--- a/source3/nmbd/nmbd_namequery.c
+++ b/source3/nmbd/nmbd_namequery.c
@@ -24,7 +24,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
extern struct in_addr ipzero;
/****************************************************************************
diff --git a/source3/nmbd/nmbd_nameregister.c b/source3/nmbd/nmbd_nameregister.c
index 6b7bb6a73a..24463e1f9b 100644
--- a/source3/nmbd/nmbd_nameregister.c
+++ b/source3/nmbd/nmbd_nameregister.c
@@ -24,8 +24,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
-
extern fstring global_myworkgroup;
/****************************************************************************
diff --git a/source3/nmbd/nmbd_namerelease.c b/source3/nmbd/nmbd_namerelease.c
index 0f693c63d0..30a9d16561 100644
--- a/source3/nmbd/nmbd_namerelease.c
+++ b/source3/nmbd/nmbd_namerelease.c
@@ -24,8 +24,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
-
/****************************************************************************
Deal with a response packet when releasing one of our names.
****************************************************************************/
diff --git a/source3/nmbd/nmbd_nodestatus.c b/source3/nmbd/nmbd_nodestatus.c
index d28ea1cff4..eeb532d410 100644
--- a/source3/nmbd/nmbd_nodestatus.c
+++ b/source3/nmbd/nmbd_nodestatus.c
@@ -24,8 +24,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
-
/****************************************************************************
Deal with a successful node status response.
****************************************************************************/
diff --git a/source3/nmbd/nmbd_packets.c b/source3/nmbd/nmbd_packets.c
index ab4b2c5e89..ace4ddfa25 100644
--- a/source3/nmbd/nmbd_packets.c
+++ b/source3/nmbd/nmbd_packets.c
@@ -28,8 +28,6 @@ extern int ClientNMB;
extern int ClientDGRAM;
extern int global_nmb_port;
-extern int DEBUGLEVEL;
-
extern int num_response_packets;
extern struct in_addr loopback_ip;
diff --git a/source3/nmbd/nmbd_processlogon.c b/source3/nmbd/nmbd_processlogon.c
index 811f963bad..bcd1e1a1ff 100644
--- a/source3/nmbd/nmbd_processlogon.c
+++ b/source3/nmbd/nmbd_processlogon.c
@@ -26,8 +26,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
-
extern pstring global_myname;
extern fstring global_myworkgroup;
diff --git a/source3/nmbd/nmbd_responserecordsdb.c b/source3/nmbd/nmbd_responserecordsdb.c
index b4376d6405..b24c85a9d8 100644
--- a/source3/nmbd/nmbd_responserecordsdb.c
+++ b/source3/nmbd/nmbd_responserecordsdb.c
@@ -26,8 +26,6 @@
extern int ClientNMB;
-extern int DEBUGLEVEL;
-
extern struct in_addr ipzero;
int num_response_packets = 0;
diff --git a/source3/nmbd/nmbd_sendannounce.c b/source3/nmbd/nmbd_sendannounce.c
index 32a6d339de..1f56dea882 100644
--- a/source3/nmbd/nmbd_sendannounce.c
+++ b/source3/nmbd/nmbd_sendannounce.c
@@ -27,7 +27,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
extern pstring global_myname;
extern fstring global_myworkgroup;
extern char **my_netbios_names;
diff --git a/source3/nmbd/nmbd_serverlistdb.c b/source3/nmbd/nmbd_serverlistdb.c
index cbc48d2313..183ea34320 100644
--- a/source3/nmbd/nmbd_serverlistdb.c
+++ b/source3/nmbd/nmbd_serverlistdb.c
@@ -27,8 +27,6 @@
extern int ClientNMB;
-extern int DEBUGLEVEL;
-
extern fstring global_myworkgroup;
extern char **my_netbios_names;
diff --git a/source3/nmbd/nmbd_subnetdb.c b/source3/nmbd/nmbd_subnetdb.c
index 996952451d..ebb6bfa9c6 100644
--- a/source3/nmbd/nmbd_subnetdb.c
+++ b/source3/nmbd/nmbd_subnetdb.c
@@ -31,8 +31,6 @@ extern int ClientNMB;
extern int ClientDGRAM;
extern int global_nmb_port;
-extern int DEBUGLEVEL;
-
extern fstring myworkgroup;
extern char **my_netbios_names;
extern struct in_addr ipzero;
diff --git a/source3/nmbd/nmbd_synclists.c b/source3/nmbd/nmbd_synclists.c
index 7ba39f0cd4..f6d1165e57 100644
--- a/source3/nmbd/nmbd_synclists.c
+++ b/source3/nmbd/nmbd_synclists.c
@@ -31,8 +31,6 @@
#include "includes.h"
#include "smb.h"
-extern int DEBUGLEVEL;
-
struct sync_record {
struct sync_record *next, *prev;
fstring workgroup;
diff --git a/source3/nmbd/nmbd_winsproxy.c b/source3/nmbd/nmbd_winsproxy.c
index d3118e82e1..8410228958 100644
--- a/source3/nmbd/nmbd_winsproxy.c
+++ b/source3/nmbd/nmbd_winsproxy.c
@@ -23,8 +23,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
-
/****************************************************************************
Function called when the name lookup succeeded.
****************************************************************************/
diff --git a/source3/nmbd/nmbd_winsserver.c b/source3/nmbd/nmbd_winsserver.c
index 621a23b9e2..ea025e66f3 100644
--- a/source3/nmbd/nmbd_winsserver.c
+++ b/source3/nmbd/nmbd_winsserver.c
@@ -26,10 +26,8 @@
#define WINS_LIST "wins.dat"
#define WINS_VERSION 1
-extern int DEBUGLEVEL;
extern struct in_addr ipzero;
-
/****************************************************************************
possibly call the WINS hook external program when a WINS change is made
*****************************************************************************/
diff --git a/source3/nmbd/nmbd_workgroupdb.c b/source3/nmbd/nmbd_workgroupdb.c
index 6bb156b41f..3b7a64b8e5 100644
--- a/source3/nmbd/nmbd_workgroupdb.c
+++ b/source3/nmbd/nmbd_workgroupdb.c
@@ -27,8 +27,6 @@
extern int ClientNMB;
-extern int DEBUGLEVEL;
-
extern pstring global_myname;
extern fstring global_myworkgroup;
extern char **my_netbios_names;
diff --git a/source3/nsswitch/winbindd.h b/source3/nsswitch/winbindd.h
index f7e86a8a43..fe25d5ba5e 100644
--- a/source3/nsswitch/winbindd.h
+++ b/source3/nsswitch/winbindd.h
@@ -30,10 +30,6 @@
#include "winbindd_nss.h"
-/* Naughty global stuff */
-
-extern int DEBUGLEVEL;
-
/* Client state structure */
struct winbindd_cli_state {
diff --git a/source3/nsswitch/wins.c b/source3/nsswitch/wins.c
index c4485ca03a..a3d5bb08de 100644
--- a/source3/nsswitch/wins.c
+++ b/source3/nsswitch/wins.c
@@ -25,8 +25,6 @@
#include "includes.h"
#include <nss.h>
-extern int DEBUGLEVEL;
-
#ifndef INADDRSZ
#define INADDRSZ 4
#endif
diff --git a/source3/param/params.c b/source3/param/params.c
index d12081fb32..7aceb1b9da 100644
--- a/source3/param/params.c
+++ b/source3/param/params.c
@@ -98,8 +98,6 @@
* bSize - The size of the global buffer <bufr>.
*/
-extern int DEBUGLEVEL;
-
static char *bufr = NULL;
static int bSize = 0;
diff --git a/source3/passdb/ldap.c b/source3/passdb/ldap.c
index 8a2befcaa8..753663a09c 100644
--- a/source3/passdb/ldap.c
+++ b/source3/passdb/ldap.c
@@ -30,8 +30,6 @@
#define ADD_USER 1
#define MODIFY_USER 2
-extern int DEBUGLEVEL;
-
/*******************************************************************
open a connection to the ldap serve.
******************************************************************/
diff --git a/source3/passdb/pampass.c b/source3/passdb/pampass.c
index 116ecaf95b..6d0dabcd9d 100644
--- a/source3/passdb/pampass.c
+++ b/source3/passdb/pampass.c
@@ -30,8 +30,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
-
#ifdef WITH_PAM
/*******************************************************************
diff --git a/source3/passdb/pass_check.c b/source3/passdb/pass_check.c
index 594983e53b..a57cb2ff06 100644
--- a/source3/passdb/pass_check.c
+++ b/source3/passdb/pass_check.c
@@ -24,8 +24,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
-
/* these are kept here to keep the string_combinations function simple */
static fstring this_user;
#if !(defined(WITH_PAM) || defined(KRB4_AUTH) || defined(KRB5_AUTH))
@@ -896,6 +894,3 @@ NTSTATUS pass_check(struct passwd *pass, char *user, char *password,
return NT_STATUS_WRONG_PASSWORD;
}
-
-
-
diff --git a/source3/passdb/passdb.c b/source3/passdb/passdb.c
index 2ffbe42f8c..b1e1e2b989 100644
--- a/source3/passdb/passdb.c
+++ b/source3/passdb/passdb.c
@@ -23,8 +23,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
-
/*
* This is set on startup - it defines the SID for this
* machine, and therefore the SAM database for which it is
diff --git a/source3/passdb/passgrp.c b/source3/passdb/passgrp.c
index 399a45d8a9..55a71e94a2 100644
--- a/source3/passdb/passgrp.c
+++ b/source3/passdb/passgrp.c
@@ -22,8 +22,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
-
/*
* NOTE. All these functions are abstracted into a structure
* that points to the correct function for the selected database. JRA.
@@ -217,4 +215,3 @@ struct smb_passwd *getsmbgrpuid(uid_t smb_userid,
{
return pwgrp_ops->getsmbgrpuid(smb_userid, grps, num_grps, alss, num_alss);
}
-
diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c
index f4ed014efe..a737b5896b 100644
--- a/source3/passdb/pdb_ldap.c
+++ b/source3/passdb/pdb_ldap.c
@@ -51,8 +51,6 @@
#define SAM_ACCOUNT struct sam_passwd
#endif
-extern int DEBUGLEVEL;
-
struct ldap_enum_info
{
LDAP *ldap_struct;
diff --git a/source3/passdb/pdb_smbpasswd.c b/source3/passdb/pdb_smbpasswd.c
index f487dcf347..b01f03e124 100644
--- a/source3/passdb/pdb_smbpasswd.c
+++ b/source3/passdb/pdb_smbpasswd.c
@@ -44,12 +44,10 @@ struct smb_passwd
};
-extern int DEBUGLEVEL;
extern pstring samlogon_user;
extern BOOL sam_logon_in_ssb;
extern struct passdb_ops pdb_ops;
-
/* used for maintain locks on the smbpasswd file */
static int pw_file_lock_depth;
static void *global_vp;
diff --git a/source3/passdb/smbpassgroup.c b/source3/passdb/smbpassgroup.c
index 4636c08c94..b332c9da7f 100644
--- a/source3/passdb/smbpassgroup.c
+++ b/source3/passdb/smbpassgroup.c
@@ -22,7 +22,6 @@
#ifdef USE_SMBPASS_DB
static int grp_file_lock_depth = 0;
-extern int DEBUGLEVEL;
/***************************************************************
Start to enumerate the smbpasswd list. Returns a void pointer
diff --git a/source3/printing/lpq_parse.c b/source3/printing/lpq_parse.c
index 90d8499595..12f12fd33c 100644
--- a/source3/printing/lpq_parse.c
+++ b/source3/printing/lpq_parse.c
@@ -20,8 +20,6 @@
*/
#include "includes.h"
-extern int DEBUGLEVEL;
-
static char *Months[13] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun",
"Jul", "Aug", "Sep", "Oct", "Nov", "Dec", "Err"};
diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index 58fc7e25ae..c61893e0fe 100644
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -22,7 +22,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
extern pstring global_myname;
extern DOM_SID global_sid_World;
diff --git a/source3/printing/pcap.c b/source3/printing/pcap.c
index 0ac7600dc5..b10dbba9c5 100644
--- a/source3/printing/pcap.c
+++ b/source3/printing/pcap.c
@@ -65,8 +65,6 @@
#include "smb.h"
-extern int DEBUGLEVEL;
-
#ifdef AIX
/* ******************************************
Extend for AIX system and qconfig file
diff --git a/source3/printing/print_cups.c b/source3/printing/print_cups.c
index 5c5d1e60d2..a83f5de43c 100644
--- a/source3/printing/print_cups.c
+++ b/source3/printing/print_cups.c
@@ -51,9 +51,6 @@ struct printif cups_printif =
cups_job_submit,
};
-extern int DEBUGLEVEL;
-
-
/*
* 'cups_passwd_cb()' - The CUPS password callback...
*/
diff --git a/source3/printing/print_generic.c b/source3/printing/print_generic.c
index bc9751a653..87031df849 100644
--- a/source3/printing/print_generic.c
+++ b/source3/printing/print_generic.c
@@ -47,8 +47,6 @@ struct printif generic_printif =
generic_job_submit,
};
-extern int DEBUGLEVEL;
-
/****************************************************************************
run a given print command
a null terminated list of value/substitute pairs is provided
diff --git a/source3/printing/print_svid.c b/source3/printing/print_svid.c
index 1878f85ac1..44127c3700 100644
--- a/source3/printing/print_svid.c
+++ b/source3/printing/print_svid.c
@@ -37,8 +37,6 @@
#ifdef SYSV
-extern int DEBUGLEVEL;
-
typedef struct printer {
char *name;
struct printer *next;
diff --git a/source3/printing/printfsp.c b/source3/printing/printfsp.c
index 2ec8de6835..35700bc868 100644
--- a/source3/printing/printfsp.c
+++ b/source3/printing/printfsp.c
@@ -21,8 +21,6 @@
*/
#include "includes.h"
-extern int DEBUGLEVEL;
-
/***************************************************************************
open a print file and setup a fsp for it. This is a wrapper around
diff --git a/source3/printing/printing.c b/source3/printing/printing.c
index 301422c1c2..9135cb2d5e 100644
--- a/source3/printing/printing.c
+++ b/source3/printing/printing.c
@@ -21,8 +21,6 @@
#include "printing.h"
-extern int DEBUGLEVEL;
-
/* Current printer interface */
struct printif *current_printif = &generic_printif;
diff --git a/source3/profile/profile.c b/source3/profile/profile.c
index 5ddc72c490..555fe7de5a 100644
--- a/source3/profile/profile.c
+++ b/source3/profile/profile.c
@@ -22,8 +22,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
-
#define IPC_PERMS ((SHM_R | SHM_W) | (SHM_R>>3) | (SHM_R>>6))
static int shm_id;
@@ -157,4 +155,3 @@ BOOL profile_setup(BOOL rdonly)
message_register(MSG_REQ_PROFILELEVEL, reqprofile_message);
return True;
}
-
diff --git a/source3/rpc_client/cli_connect.c b/source3/rpc_client/cli_connect.c
index f506729411..239bd9c6d5 100644
--- a/source3/rpc_client/cli_connect.c
+++ b/source3/rpc_client/cli_connect.c
@@ -32,7 +32,6 @@ static uint32 num_cons = 0;
struct user_creds *usr_creds = NULL;
vuser_key *user_key = NULL;
-extern int DEBUGLEVEL;
extern pstring global_myname;
/*
* needed for the struct cli_connection
@@ -379,4 +378,3 @@ BOOL rpc_con_ok(struct cli_connection *con)
return True;
}
-
diff --git a/source3/rpc_client/cli_login.c b/source3/rpc_client/cli_login.c
index 790fddd7c3..0f54d5512c 100644
--- a/source3/rpc_client/cli_login.c
+++ b/source3/rpc_client/cli_login.c
@@ -23,7 +23,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
extern fstring global_myworkgroup;
extern pstring global_myname;
diff --git a/source3/rpc_client/cli_lsarpc.c b/source3/rpc_client/cli_lsarpc.c
index 2f4343c957..ead820aafd 100644
--- a/source3/rpc_client/cli_lsarpc.c
+++ b/source3/rpc_client/cli_lsarpc.c
@@ -24,8 +24,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
-
/****************************************************************************
do a LSA Open Policy
****************************************************************************/
diff --git a/source3/rpc_client/cli_netlogon.c b/source3/rpc_client/cli_netlogon.c
index 324f5dc90f..f67a7175bf 100644
--- a/source3/rpc_client/cli_netlogon.c
+++ b/source3/rpc_client/cli_netlogon.c
@@ -29,7 +29,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
extern pstring global_myname;
extern fstring global_myworkgroup;
diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c
index 4415b461d9..9251f879d2 100644
--- a/source3/rpc_client/cli_pipe.c
+++ b/source3/rpc_client/cli_pipe.c
@@ -24,7 +24,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
extern struct pipe_id_info pipe_names[];
extern fstring global_myworkgroup;
extern pstring global_myname;
diff --git a/source3/rpc_client/cli_reg.c b/source3/rpc_client/cli_reg.c
index 2e71d5a18f..229b82db52 100644
--- a/source3/rpc_client/cli_reg.c
+++ b/source3/rpc_client/cli_reg.c
@@ -1,4 +1,3 @@
-
/*
* Unix SMB/Netbios implementation.
* Version 1.9.
@@ -30,8 +29,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
-
/****************************************************************************
do a REG Open Policy
****************************************************************************/
diff --git a/source3/rpc_client/cli_samr.c b/source3/rpc_client/cli_samr.c
index a0e9ab6a00..fc15556924 100644
--- a/source3/rpc_client/cli_samr.c
+++ b/source3/rpc_client/cli_samr.c
@@ -21,16 +21,12 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-
-
#ifdef SYSLOG
#undef SYSLOG
#endif
#include "includes.h"
-extern int DEBUGLEVEL;
-
/****************************************************************************
do a SAMR query user groups
****************************************************************************/
diff --git a/source3/rpc_client/cli_spoolss.c b/source3/rpc_client/cli_spoolss.c
index 9c93ec02d5..39655519f9 100644
--- a/source3/rpc_client/cli_spoolss.c
+++ b/source3/rpc_client/cli_spoolss.c
@@ -26,8 +26,6 @@
#include "rpc_parse.h"
#include "nterr.h"
-extern int DEBUGLEVEL;
-
/****************************************************************************
do a SPOOLSS Enum Printer Drivers
****************************************************************************/
@@ -818,5 +816,3 @@ uint32 spoolss_addprinterdriver(const char *srv_name, uint32 level, PRINTER_DRIV
return r_o.status;
}
-
-
diff --git a/source3/rpc_client/cli_spoolss_notify.c b/source3/rpc_client/cli_spoolss_notify.c
index ca9f153ec7..2f89e200d2 100644
--- a/source3/rpc_client/cli_spoolss_notify.c
+++ b/source3/rpc_client/cli_spoolss_notify.c
@@ -24,7 +24,6 @@
#include "rpc_parse.h"
#include "nterr.h"
-extern int DEBUGLEVEL;
extern pstring global_myname;
/*********************************************************
@@ -292,4 +291,3 @@ BOOL cli_spoolss_reply_close_printer(struct cli_state *cli, POLICY_HND *handle,
return True;
}
-
diff --git a/source3/rpc_client/cli_srvsvc.c b/source3/rpc_client/cli_srvsvc.c
index d4522714f2..cb3a784d07 100644
--- a/source3/rpc_client/cli_srvsvc.c
+++ b/source3/rpc_client/cli_srvsvc.c
@@ -1,4 +1,3 @@
-
/*
* Unix SMB/Netbios implementation.
* Version 1.9.
@@ -23,15 +22,12 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-
#ifdef SYSLOG
#undef SYSLOG
#endif
#include "includes.h"
-extern int DEBUGLEVEL;
-
/****************************************************************************
do a server net conn enum
****************************************************************************/
diff --git a/source3/rpc_client/cli_use.c b/source3/rpc_client/cli_use.c
index fdd0ee9a5b..acdfe46fda 100644
--- a/source3/rpc_client/cli_use.c
+++ b/source3/rpc_client/cli_use.c
@@ -25,7 +25,6 @@
#include "includes.h"
#include "trans2.h"
-extern int DEBUGLEVEL;
extern pstring scope;
extern pstring global_myname;
diff --git a/source3/rpc_client/cli_wkssvc.c b/source3/rpc_client/cli_wkssvc.c
index 5d4ad80707..6b2a72515c 100644
--- a/source3/rpc_client/cli_wkssvc.c
+++ b/source3/rpc_client/cli_wkssvc.c
@@ -1,4 +1,3 @@
-
/*
* Unix SMB/Netbios implementation.
* Version 1.9.
@@ -23,15 +22,12 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-
#ifdef SYSLOG
#undef SYSLOG
#endif
#include "includes.h"
-extern int DEBUGLEVEL;
-
/****************************************************************************
do a WKS Open Policy
****************************************************************************/
diff --git a/source3/rpc_client/msrpc_spoolss.c b/source3/rpc_client/msrpc_spoolss.c
index 288c7f63cb..3baec6c569 100644
--- a/source3/rpc_client/msrpc_spoolss.c
+++ b/source3/rpc_client/msrpc_spoolss.c
@@ -26,8 +26,6 @@
#include "rpc_parse.h"
#include "rpcclient.h"
-extern int DEBUGLEVEL;
-
#define DEBUG_TESTING
extern FILE* out_hnd;
@@ -810,4 +808,3 @@ BOOL msrpc_spoolss_getprinterdriverdir(char* srv_name, char* env_name, uint32 le
return True;
}
-
diff --git a/source3/rpc_client/ncacn_np_use.c b/source3/rpc_client/ncacn_np_use.c
index 99557d4a06..d903b40c14 100644
--- a/source3/rpc_client/ncacn_np_use.c
+++ b/source3/rpc_client/ncacn_np_use.c
@@ -20,14 +20,12 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-
#define NO_SYSLOG
#include "includes.h"
#include "rpc_parse.h"
#include "trans2.h"
-extern int DEBUGLEVEL;
extern pstring global_myname;
struct ncacn_np_use
@@ -454,6 +452,3 @@ struct ncacn_np *ncacn_np_use_add(const char *pipe_name,
cli->num_users++;
return cli->cli;
}
-
-
-
diff --git a/source3/rpc_client/ntclienttrust.c b/source3/rpc_client/ntclienttrust.c
index 9e1bcf2261..d17eeeb952 100644
--- a/source3/rpc_client/ntclienttrust.c
+++ b/source3/rpc_client/ntclienttrust.c
@@ -26,8 +26,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
-
/************************************************************************
check workstation trust account status
@@ -162,5 +160,3 @@ BOOL trust_account_check(struct in_addr dest_ip, char *dest_host,
cli_shutdown(&cli_trust);
return right_error_code;
}
-
-
diff --git a/source3/rpc_parse/parse_creds.c b/source3/rpc_parse/parse_creds.c
index 1ad9143009..36e08f5746 100644
--- a/source3/rpc_parse/parse_creds.c
+++ b/source3/rpc_parse/parse_creds.c
@@ -21,12 +21,8 @@
* Foundation, Inc., 675 Mass Ave, Cambgrpsge, MA 02139, USA.
*/
-
#include "includes.h"
-extern int DEBUGLEVEL;
-
-
/*******************************************************************
makes a CREDS_UNIX structure.
********************************************************************/
diff --git a/source3/rpc_parse/parse_dfs.c b/source3/rpc_parse/parse_dfs.c
index 2fe72da5a1..a152e3528e 100644
--- a/source3/rpc_parse/parse_dfs.c
+++ b/source3/rpc_parse/parse_dfs.c
@@ -26,8 +26,6 @@
#include "nterr.h"
#include "rpc_parse.h"
-extern int DEBUGLEVEL;
-
/*******************************************************************
Make a DFS_Q_DFS_QUERY structure
*******************************************************************/
diff --git a/source3/rpc_parse/parse_lsa.c b/source3/rpc_parse/parse_lsa.c
index 29da2c6913..f69f3ebdef 100644
--- a/source3/rpc_parse/parse_lsa.c
+++ b/source3/rpc_parse/parse_lsa.c
@@ -23,8 +23,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
-
static BOOL lsa_io_trans_names(char *desc, LSA_TRANS_NAME_ENUM *trn, prs_struct *ps, int depth);
/*******************************************************************
@@ -1822,8 +1820,3 @@ BOOL lsa_io_r_getsystemaccount(char *desc, LSA_R_GETSYSTEMACCOUNT *r_c, prs_str
return True;
}
-
-
-
-
-
diff --git a/source3/rpc_parse/parse_misc.c b/source3/rpc_parse/parse_misc.c
index 3015e383fd..6353c9a8cd 100644
--- a/source3/rpc_parse/parse_misc.c
+++ b/source3/rpc_parse/parse_misc.c
@@ -21,11 +21,8 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-
#include "includes.h"
-extern int DEBUGLEVEL;
-
/****************************************************************************
A temporary TALLOC context for things like unistrs, that is valid for
the life of a complete RPC call.
diff --git a/source3/rpc_parse/parse_net.c b/source3/rpc_parse/parse_net.c
index eb1ddd36f7..cfd90241d0 100644
--- a/source3/rpc_parse/parse_net.c
+++ b/source3/rpc_parse/parse_net.c
@@ -23,8 +23,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
-
/*******************************************************************
Reads or writes a structure.
********************************************************************/
diff --git a/source3/rpc_parse/parse_prs.c b/source3/rpc_parse/parse_prs.c
index 84c9a3abf4..7b38e82f5a 100644
--- a/source3/rpc_parse/parse_prs.c
+++ b/source3/rpc_parse/parse_prs.c
@@ -21,11 +21,8 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-extern int DEBUGLEVEL;
-
#include "includes.h"
-
/*******************************************************************
dump a prs to a file
********************************************************************/
diff --git a/source3/rpc_parse/parse_reg.c b/source3/rpc_parse/parse_reg.c
index e7c1b8ecfe..67d8d89b01 100644
--- a/source3/rpc_parse/parse_reg.c
+++ b/source3/rpc_parse/parse_reg.c
@@ -23,12 +23,8 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-
#include "includes.h"
-extern int DEBUGLEVEL;
-
-
/*******************************************************************
Inits a structure.
********************************************************************/
@@ -1682,4 +1678,3 @@ BOOL reg_io_r_abort_shutdown(char *desc, REG_R_ABORT_SHUTDOWN * r_s,
return True;
}
-
diff --git a/source3/rpc_parse/parse_rpc.c b/source3/rpc_parse/parse_rpc.c
index e457b48bf9..f4a84adee3 100644
--- a/source3/rpc_parse/parse_rpc.c
+++ b/source3/rpc_parse/parse_rpc.c
@@ -1,4 +1,3 @@
-
/*
* Unix SMB/Netbios implementation.
* Version 1.9.
@@ -23,12 +22,8 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-
#include "includes.h"
-extern int DEBUGLEVEL;
-
-
/*******************************************************************
interface/version dce/rpc pipe identification
********************************************************************/
diff --git a/source3/rpc_parse/parse_samr.c b/source3/rpc_parse/parse_samr.c
index 82902e5149..c92dbda7ec 100644
--- a/source3/rpc_parse/parse_samr.c
+++ b/source3/rpc_parse/parse_samr.c
@@ -27,8 +27,6 @@
#include "rpc_parse.h"
#include "nterr.h"
-extern int DEBUGLEVEL;
-
/*******************************************************************
inits a SAMR_Q_CLOSE_HND structure.
********************************************************************/
diff --git a/source3/rpc_parse/parse_sec.c b/source3/rpc_parse/parse_sec.c
index 3d79c12cdb..98f076c1e3 100644
--- a/source3/rpc_parse/parse_sec.c
+++ b/source3/rpc_parse/parse_sec.c
@@ -24,8 +24,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
-
#define SD_HEADER_SIZE 0x14
/*******************************************************************
diff --git a/source3/rpc_parse/parse_spoolss.c b/source3/rpc_parse/parse_spoolss.c
index 6e0bcdb905..76e06a343a 100644
--- a/source3/rpc_parse/parse_spoolss.c
+++ b/source3/rpc_parse/parse_spoolss.c
@@ -24,8 +24,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
-
/*******************************************************************
return the length of a UNISTR string.
********************************************************************/
diff --git a/source3/rpc_parse/parse_srv.c b/source3/rpc_parse/parse_srv.c
index 057367054a..fa52b24495 100644
--- a/source3/rpc_parse/parse_srv.c
+++ b/source3/rpc_parse/parse_srv.c
@@ -22,11 +22,8 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-
#include "includes.h"
-extern int DEBUGLEVEL;
-
/*******************************************************************
Inits a SH_INFO_1_STR structure
********************************************************************/
diff --git a/source3/rpc_parse/parse_wks.c b/source3/rpc_parse/parse_wks.c
index 07194e1c31..ecd4a201ae 100644
--- a/source3/rpc_parse/parse_wks.c
+++ b/source3/rpc_parse/parse_wks.c
@@ -1,4 +1,3 @@
-
/*
* Unix SMB/Netbios implementation.
* Version 1.9.
@@ -22,11 +21,8 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-
#include "includes.h"
-extern int DEBUGLEVEL;
-
/*******************************************************************
Init
********************************************************************/
diff --git a/source3/rpc_server/srv_dfs.c b/source3/rpc_server/srv_dfs.c
index e2a78782f3..00a0f58df5 100644
--- a/source3/rpc_server/srv_dfs.c
+++ b/source3/rpc_server/srv_dfs.c
@@ -29,7 +29,6 @@
#define MAX_MSDFS_JUNCTIONS 256
-extern int DEBUGLEVEL;
extern pstring global_myname;
/**********************************************************************
@@ -176,4 +175,3 @@ BOOL api_netdfs_rpc(pipes_struct *p)
{
return api_rpcTNP(p, "api_netdfs_rpc", api_netdfs_cmds);
}
-
diff --git a/source3/rpc_server/srv_dfs_nt.c b/source3/rpc_server/srv_dfs_nt.c
index dba8ddd0d8..e62334c377 100644
--- a/source3/rpc_server/srv_dfs_nt.c
+++ b/source3/rpc_server/srv_dfs_nt.c
@@ -27,7 +27,6 @@
#include "includes.h"
#include "nterr.h"
-extern int DEBUGLEVEL;
extern pstring global_myname;
#define MAX_MSDFS_JUNCTIONS 256
diff --git a/source3/rpc_server/srv_lsa.c b/source3/rpc_server/srv_lsa.c
index 9c934f5023..4331ffca8d 100644
--- a/source3/rpc_server/srv_lsa.c
+++ b/source3/rpc_server/srv_lsa.c
@@ -26,8 +26,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
-
/***************************************************************************
api_lsa_open_policy2
***************************************************************************/
diff --git a/source3/rpc_server/srv_lsa_hnd.c b/source3/rpc_server/srv_lsa_hnd.c
index ad726f4cfa..d5f9a52e2f 100644
--- a/source3/rpc_server/srv_lsa_hnd.c
+++ b/source3/rpc_server/srv_lsa_hnd.c
@@ -23,8 +23,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
-
/* This is the max handles across all instances of a pipe name. */
#ifndef MAX_OPEN_POLS
#define MAX_OPEN_POLS 1024
diff --git a/source3/rpc_server/srv_lsa_nt.c b/source3/rpc_server/srv_lsa_nt.c
index 98038c2ac7..eeaf9c6347 100644
--- a/source3/rpc_server/srv_lsa_nt.c
+++ b/source3/rpc_server/srv_lsa_nt.c
@@ -26,7 +26,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
extern DOM_SID global_sam_sid;
extern fstring global_myworkgroup;
extern pstring global_myname;
diff --git a/source3/rpc_server/srv_netlog.c b/source3/rpc_server/srv_netlog.c
index 93d7fea554..06e2f75ead 100644
--- a/source3/rpc_server/srv_netlog.c
+++ b/source3/rpc_server/srv_netlog.c
@@ -26,8 +26,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
-
/*************************************************************************
api_net_req_chal:
*************************************************************************/
diff --git a/source3/rpc_server/srv_netlog_nt.c b/source3/rpc_server/srv_netlog_nt.c
index fffa5b1ba1..678c48ff71 100644
--- a/source3/rpc_server/srv_netlog_nt.c
+++ b/source3/rpc_server/srv_netlog_nt.c
@@ -27,8 +27,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
-
extern BOOL sam_logon_in_ssb;
extern pstring samlogon_user;
extern pstring global_myname;
diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c
index 00acb93cf3..2957d7cc95 100644
--- a/source3/rpc_server/srv_pipe.c
+++ b/source3/rpc_server/srv_pipe.c
@@ -40,8 +40,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
-
static void NTLMSSPcalc_p( pipes_struct *p, unsigned char *data, int len)
{
unsigned char *hash = p->ntlmssp_hash;
diff --git a/source3/rpc_server/srv_pipe_hnd.c b/source3/rpc_server/srv_pipe_hnd.c
index 082d3a1263..10d0c3bcb8 100644
--- a/source3/rpc_server/srv_pipe_hnd.c
+++ b/source3/rpc_server/srv_pipe_hnd.c
@@ -21,14 +21,11 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-
#include "includes.h"
-
#define PIPE "\\PIPE\\"
#define PIPELEN strlen(PIPE)
-extern int DEBUGLEVEL;
static pipes_struct *chain_p;
static int pipes_open;
diff --git a/source3/rpc_server/srv_reg.c b/source3/rpc_server/srv_reg.c
index 8aa5c4bddf..1280dc4aa9 100644
--- a/source3/rpc_server/srv_reg.c
+++ b/source3/rpc_server/srv_reg.c
@@ -27,8 +27,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
-
/*******************************************************************
api_reg_close
********************************************************************/
diff --git a/source3/rpc_server/srv_reg_nt.c b/source3/rpc_server/srv_reg_nt.c
index b1c0e8bc65..d934083e6b 100644
--- a/source3/rpc_server/srv_reg_nt.c
+++ b/source3/rpc_server/srv_reg_nt.c
@@ -27,8 +27,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
-
struct reg_info
{
/* for use by \PIPE\winreg */
diff --git a/source3/rpc_server/srv_samr.c b/source3/rpc_server/srv_samr.c
index f00ecae3ce..fb7bd4fb25 100644
--- a/source3/rpc_server/srv_samr.c
+++ b/source3/rpc_server/srv_samr.c
@@ -32,8 +32,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
-
/*******************************************************************
api_samr_close_hnd
********************************************************************/
diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c
index 9748d0e950..d9cae42145 100644
--- a/source3/rpc_server/srv_samr_nt.c
+++ b/source3/rpc_server/srv_samr_nt.c
@@ -29,8 +29,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
-
extern fstring global_myworkgroup;
extern pstring global_myname;
extern DOM_SID global_sam_sid;
diff --git a/source3/rpc_server/srv_spoolss.c b/source3/rpc_server/srv_spoolss.c
index 6c65cb078b..a5ae418cd4 100755
--- a/source3/rpc_server/srv_spoolss.c
+++ b/source3/rpc_server/srv_spoolss.c
@@ -24,8 +24,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
-
/********************************************************************
* api_spoolss_open_printer_ex
********************************************************************/
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index 118a2d64c9..b7ccce92d5 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -27,7 +27,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
extern pstring global_myname;
#ifndef MAX_OPEN_PRINTER_EXS
diff --git a/source3/rpc_server/srv_srvsvc.c b/source3/rpc_server/srv_srvsvc.c
index fe008d0dde..35bacc3458 100644
--- a/source3/rpc_server/srv_srvsvc.c
+++ b/source3/rpc_server/srv_srvsvc.c
@@ -26,8 +26,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
-
/*******************************************************************
api_srv_net_srv_get_info
********************************************************************/
diff --git a/source3/rpc_server/srv_srvsvc_nt.c b/source3/rpc_server/srv_srvsvc_nt.c
index 2877b7af05..7e82599f28 100644
--- a/source3/rpc_server/srv_srvsvc_nt.c
+++ b/source3/rpc_server/srv_srvsvc_nt.c
@@ -26,7 +26,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
extern pstring global_myname;
/*******************************************************************
diff --git a/source3/rpc_server/srv_util.c b/source3/rpc_server/srv_util.c
index dc66887ee9..d441758db2 100644
--- a/source3/rpc_server/srv_util.c
+++ b/source3/rpc_server/srv_util.c
@@ -39,8 +39,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
-
/*
* A list of the rids of well known BUILTIN and Domain users
* and groups.
diff --git a/source3/rpc_server/srv_wkssvc.c b/source3/rpc_server/srv_wkssvc.c
index 12e4a8f335..3661824da1 100644
--- a/source3/rpc_server/srv_wkssvc.c
+++ b/source3/rpc_server/srv_wkssvc.c
@@ -25,8 +25,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
-
/*******************************************************************
api_wks_query_info
********************************************************************/
diff --git a/source3/rpc_server/srv_wkssvc_nt.c b/source3/rpc_server/srv_wkssvc_nt.c
index 4bbc0e237f..f618531b5f 100644
--- a/source3/rpc_server/srv_wkssvc_nt.c
+++ b/source3/rpc_server/srv_wkssvc_nt.c
@@ -26,7 +26,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
extern pstring global_myname;
/*******************************************************************
diff --git a/source3/rpcclient/cmd_dfs.c b/source3/rpcclient/cmd_dfs.c
index a00b429d5b..a3de9f626d 100644
--- a/source3/rpcclient/cmd_dfs.c
+++ b/source3/rpcclient/cmd_dfs.c
@@ -22,7 +22,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
extern pstring server;
/* Check DFS is supported by the remote server */
diff --git a/source3/rpcclient/cmd_lsarpc.c b/source3/rpcclient/cmd_lsarpc.c
index b928126ae3..273662b6f9 100644
--- a/source3/rpcclient/cmd_lsarpc.c
+++ b/source3/rpcclient/cmd_lsarpc.c
@@ -22,7 +22,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
extern pstring server;
/* Look up domain related information on a remote host */
diff --git a/source3/rpcclient/cmd_netlogon.c b/source3/rpcclient/cmd_netlogon.c
index 3adae373ff..3d73fc1fde 100644
--- a/source3/rpcclient/cmd_netlogon.c
+++ b/source3/rpcclient/cmd_netlogon.c
@@ -22,8 +22,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
-
static NTSTATUS cmd_netlogon_logon_ctrl2(struct cli_state *cli, int argc,
char **argv)
{
diff --git a/source3/rpcclient/cmd_reg.c b/source3/rpcclient/cmd_reg.c
index baa3c071c7..28cd83ef58 100644
--- a/source3/rpcclient/cmd_reg.c
+++ b/source3/rpcclient/cmd_reg.c
@@ -21,16 +21,12 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-
-
#ifdef SYSLOG
#undef SYSLOG
#endif
#include "includes.h"
-extern int DEBUGLEVEL;
-
extern int smb_tidx;
extern FILE* out_hnd;
@@ -1071,4 +1067,3 @@ struct cmd_set reg_commands[] = {
*/
{ NULL }
};
-
diff --git a/source3/rpcclient/cmd_spoolss.c b/source3/rpcclient/cmd_spoolss.c
index 0330dd8024..31683c6386 100644
--- a/source3/rpcclient/cmd_spoolss.c
+++ b/source3/rpcclient/cmd_spoolss.c
@@ -25,8 +25,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
-
extern pstring server;
extern pstring global_myname;
extern pstring username, password;
diff --git a/source3/rpcclient/cmd_srvsvc.c b/source3/rpcclient/cmd_srvsvc.c
index e5addc1acc..9e5b2054ee 100644
--- a/source3/rpcclient/cmd_srvsvc.c
+++ b/source3/rpcclient/cmd_srvsvc.c
@@ -24,8 +24,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
-
/* Display server query info */
static char *get_server_type_str(uint32 type)
diff --git a/source3/rpcclient/cmd_wkssvc.c b/source3/rpcclient/cmd_wkssvc.c
index 69a3920c27..6801f17c00 100644
--- a/source3/rpcclient/cmd_wkssvc.c
+++ b/source3/rpcclient/cmd_wkssvc.c
@@ -28,8 +28,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
-
#define DEBUG_TESTING
extern struct cli_state *smb_cli;
@@ -91,4 +89,3 @@ void cmd_wks_query_info(struct client_info *info)
DEBUG(5,("cmd_wks_query_info: query failed\n"));
}
}
-
diff --git a/source3/rpcclient/rpcclient.c b/source3/rpcclient/rpcclient.c
index 310acd3c32..1dc0255296 100644
--- a/source3/rpcclient/rpcclient.c
+++ b/source3/rpcclient/rpcclient.c
@@ -22,7 +22,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
extern fstring debugf;
DOM_SID domain_sid;
diff --git a/source3/rpcclient/samsync.c b/source3/rpcclient/samsync.c
index 50177ce552..c659784f57 100644
--- a/source3/rpcclient/samsync.c
+++ b/source3/rpcclient/samsync.c
@@ -22,8 +22,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
-
/* Synchronise sam database */
static NTSTATUS sam_sync(struct cli_state *cli, unsigned char trust_passwd[16],
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 {
diff --git a/source3/smbwrapper/shared.c b/source3/smbwrapper/shared.c
index 5a9f688298..a10ef05bfc 100644
--- a/source3/smbwrapper/shared.c
+++ b/source3/smbwrapper/shared.c
@@ -21,8 +21,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
-
static int shared_fd;
static char *variables;
static int shared_size;
diff --git a/source3/smbwrapper/smbw.c b/source3/smbwrapper/smbw.c
index 5702ea51ca..ab15bd93dc 100644
--- a/source3/smbwrapper/smbw.c
+++ b/source3/smbwrapper/smbw.c
@@ -29,7 +29,6 @@ static struct smbw_server *smbw_srvs;
struct bitmap *smbw_file_bmap;
extern pstring global_myname;
-extern int DEBUGLEVEL;
fstring smbw_prefix = SMBW_PREFIX;
diff --git a/source3/smbwrapper/smbw_dir.c b/source3/smbwrapper/smbw_dir.c
index 6cbc34391f..cd10b488a1 100644
--- a/source3/smbwrapper/smbw_dir.c
+++ b/source3/smbwrapper/smbw_dir.c
@@ -28,7 +28,6 @@ extern fstring smbw_prefix;
static struct smbw_dir *smbw_dirs;
extern struct bitmap *smbw_file_bmap;
-extern int DEBUGLEVEL;
extern int smbw_busy;
@@ -688,4 +687,3 @@ off_t smbw_telldir(DIR *dirp)
struct smbw_dir *d = (struct smbw_dir *)dirp;
return smbw_dir_lseek(d->fd,0,SEEK_CUR);
}
-
diff --git a/source3/smbwrapper/smbw_stat.c b/source3/smbwrapper/smbw_stat.c
index 74bf83d0dc..40fb191e02 100644
--- a/source3/smbwrapper/smbw_stat.c
+++ b/source3/smbwrapper/smbw_stat.c
@@ -21,11 +21,8 @@
#include "includes.h"
-extern int DEBUGLEVEL;
-
extern int smbw_busy;
-
/*****************************************************
setup basic info in a stat structure
*******************************************************/
diff --git a/source3/torture/masktest.c b/source3/torture/masktest.c
index 06abf5f3f6..2ed15ca51d 100644
--- a/source3/torture/masktest.c
+++ b/source3/torture/masktest.c
@@ -23,7 +23,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
static fstring password;
static fstring username;
static int got_pass;
diff --git a/source3/torture/rpctorture.c b/source3/torture/rpctorture.c
index 154d277641..24b2fd9dc3 100644
--- a/source3/torture/rpctorture.c
+++ b/source3/torture/rpctorture.c
@@ -35,8 +35,6 @@ extern pstring user_socket_options;
extern pstring debugf;
-extern int DEBUGLEVEL;
-
extern file_info def_finfo;
diff --git a/source3/utils/nmblookup.c b/source3/utils/nmblookup.c
index ff675a72e5..ceec1859e7 100644
--- a/source3/utils/nmblookup.c
+++ b/source3/utils/nmblookup.c
@@ -24,8 +24,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
-
extern struct in_addr ipzero;
static BOOL use_bcast = True;
diff --git a/source3/utils/pdbedit.c b/source3/utils/pdbedit.c
index 64a152aaa1..6e7458fb4e 100644
--- a/source3/utils/pdbedit.c
+++ b/source3/utils/pdbedit.c
@@ -32,7 +32,6 @@
#include "includes.h"
extern pstring global_myname;
-extern int DEBUGLEVEL;
/*
* Next two lines needed for SunOS and don't
diff --git a/source3/utils/rpccheck.c b/source3/utils/rpccheck.c
index 1b00d528ac..287b39bd1e 100644
--- a/source3/utils/rpccheck.c
+++ b/source3/utils/rpccheck.c
@@ -21,8 +21,6 @@
#include "includes.h"
-extern int DEBUGLEVEL;
-
main()
{
char filter[]="0123456789ABCDEF";
diff --git a/source3/utils/smbfilter.c b/source3/utils/smbfilter.c
index 8550159955..5c21f22cfd 100644
--- a/source3/utils/smbfilter.c
+++ b/source3/utils/smbfilter.c
@@ -36,8 +36,6 @@
static char *netbiosname;
static char packet[BUFFER_SIZE];
-extern int DEBUGLEVEL;
-
static void filter_reply(char *buf)
{
int msg_type = CVAL(buf,0);
diff --git a/source3/utils/smbgroupedit.c b/source3/utils/smbgroupedit.c
index 4e192ed43d..062271abc5 100644
--- a/source3/utils/smbgroupedit.c
+++ b/source3/utils/smbgroupedit.c
@@ -23,7 +23,6 @@
#include "includes.h"
extern pstring global_myname;
-extern int DEBUGLEVEL;
extern DOM_SID global_sam_sid;
/*
@@ -342,5 +341,3 @@ int main (int argc, char **argv)
return 0;
}
-
-
diff --git a/source3/utils/smbpasswd.c b/source3/utils/smbpasswd.c
index 168547c712..13ca1c0d71 100644
--- a/source3/utils/smbpasswd.c
+++ b/source3/utils/smbpasswd.c
@@ -22,7 +22,6 @@
#include "includes.h"
extern pstring global_myname;
-extern int DEBUGLEVEL;
/*
* Next two lines needed for SunOS and don't
diff --git a/source3/utils/status.c b/source3/utils/status.c
index 15c9c4aad4..3beae0f815 100644
--- a/source3/utils/status.c
+++ b/source3/utils/status.c
@@ -44,8 +44,6 @@ struct session_record{
struct session_record *next;
} *srecs;
-extern int DEBUGLEVEL;
-
static pstring Ucrit_username = ""; /* added by OH */
static pid_t Ucrit_pid[100]; /* Ugly !!! */ /* added by OH */
static int Ucrit_MaxPid=0; /* added by OH */
@@ -680,4 +678,3 @@ static int traverse_sessionid(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf, vo
return (0);
}
-
diff --git a/source3/utils/testparm.c b/source3/utils/testparm.c
index f4d072ed77..09948b8635 100644
--- a/source3/utils/testparm.c
+++ b/source3/utils/testparm.c
@@ -35,9 +35,6 @@
#include "includes.h"
#include "smb.h"
-/* these live in util.c */
-extern int DEBUGLEVEL;
-
/***********************************************
Here we do a set of 'hard coded' checks for bad
configuration settings.
diff --git a/source3/utils/testprns.c b/source3/utils/testprns.c
index df697a0ed1..cf26e8aa40 100644
--- a/source3/utils/testprns.c
+++ b/source3/utils/testprns.c
@@ -34,9 +34,6 @@
#include "includes.h"
#include "smb.h"
-/* these live in util.c */
-extern int DEBUGLEVEL;
-
int main(int argc, char *argv[])
{
char *pszTemp;
@@ -66,4 +63,3 @@ int main(int argc, char *argv[])
}
return (0);
}
-