Removed extern int DEBUGLEVEL - included in headers.

Moved from timestamp based comparison of open files in share mode table to
generational file_id comparison. This should help track down any logic bugs.
Needs some more testing. Coming to HEAD as soon as the compile finishes :-).
Jeremy.

27 files changed, 0 insertions, 49 deletions

diff --git a/source/lib/access.c b/source/lib/access.c
index ed4d5ac3631..133a82dd10c 100644
--- a/source/lib/access.c
+++ b/source/lib/access.c
@@ -10,8 +10,6 @@
 
 #include "includes.h"
 
-extern int DEBUGLEVEL;
-
 /* Delimiters for lists of daemons or clients. */
 static char *sep = ", \t";
 
diff --git a/source/lib/bitmap.c b/source/lib/bitmap.c
index 7625f529095..44f6441fdfb 100644
--- a/source/lib/bitmap.c
+++ b/source/lib/bitmap.c
@@ -21,8 +21,6 @@
 
 #include "includes.h"
 
-extern int DEBUGLEVEL;
-
 /* these functions provide a simple way to allocate integers from a
    pool without repitition */
 
diff --git a/source/lib/charcnv.c b/source/lib/charcnv.c
index 4a3d7090e31..4ce6db60f3a 100644
--- a/source/lib/charcnv.c
+++ b/source/lib/charcnv.c
@@ -21,7 +21,6 @@
 */
 #include "includes.h"
 #define CTRLZ 26
-extern int DEBUGLEVEL;
 
 static char cvtbuf[sizeof(pstring)];
 
diff --git a/source/lib/charset.c b/source/lib/charset.c
index d699df3e2b8..d9054d9cd1e 100644
--- a/source/lib/charset.c
+++ b/source/lib/charset.c
@@ -22,8 +22,6 @@
 #define CHARSET_C
 #include "includes.h"
 
-extern int DEBUGLEVEL;
-
 /*
  * Codepage definitions.
  */
diff --git a/source/lib/crc32.c b/source/lib/crc32.c
index 16b337c764b..e026fbf8615 100644
--- a/source/lib/crc32.c
+++ b/source/lib/crc32.c
@@ -7,7 +7,6 @@
  */
 
 #include "includes.h"
-extern int DEBUGLEVEL;
 
 static unsigned long CRCTable[256] = 
 {
diff --git a/source/lib/domain_namemap.c b/source/lib/domain_namemap.c
index 988f5e5d659..ef59e4d92f8 100644
--- a/source/lib/domain_namemap.c
+++ b/source/lib/domain_namemap.c
@@ -47,7 +47,6 @@
 
 
 #include "includes.h"
-extern int DEBUGLEVEL;
 
 extern fstring global_myworkgroup;
 extern DOM_SID global_member_sid;
diff --git a/source/lib/fault.c b/source/lib/fault.c
index 29272f19280..1cd1a78eb74 100644
--- a/source/lib/fault.c
+++ b/source/lib/fault.c
@@ -20,8 +20,6 @@
 */
 
 #include "includes.h"
-extern int DEBUGLEVEL;
-
 
 static void (*cont_fn)(void *);
 
diff --git a/source/lib/genrand.c b/source/lib/genrand.c
index e5912601182..54d561d2212 100644
--- a/source/lib/genrand.c
+++ b/source/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/source/lib/hash.c b/source/lib/hash.c
index 3abdc2ef11b..68c334a8ca8 100644
--- a/source/lib/hash.c
+++ b/source/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/source/lib/interface.c b/source/lib/interface.c
index 3e45d627d37..8f975e10b5f 100644
--- a/source/lib/interface.c
+++ b/source/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/source/lib/netatalk.c b/source/lib/netatalk.c
index ae0a57154e1..e1913f5379b 100644
--- a/source/lib/netatalk.c
+++ b/source/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
diff --git a/source/lib/pidfile.c b/source/lib/pidfile.c
index a26aa12a3c1..25ca1944111 100644
--- a/source/lib/pidfile.c
+++ b/source/lib/pidfile.c
@@ -24,8 +24,6 @@
 #include "includes.h"
 
 
-extern int DEBUGLEVEL;
-
 #ifndef O_NONBLOCK
 #define O_NONBLOCK
 #endif
diff --git a/source/lib/replace.c b/source/lib/replace.c
index 45c302f498a..24b2a66bebe 100644
--- a/source/lib/replace.c
+++ b/source/lib/replace.c
@@ -21,8 +21,6 @@
 
 #include "includes.h"
 
-extern int DEBUGLEVEL;
-
  void replace_dummy(void);
  void replace_dummy(void) {}
 
diff --git a/source/lib/smbrun.c b/source/lib/smbrun.c
index 62378503e0f..1ace6e3a991 100644
--- a/source/lib/smbrun.c
+++ b/source/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/source/lib/substitute.c b/source/lib/substitute.c
index 1bfe4a69687..f116f1ea9bf 100644
--- a/source/lib/substitute.c
+++ b/source/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;
diff --git a/source/lib/sysacls.c b/source/lib/sysacls.c
index 0f488888a8f..77adbce1506 100644
--- a/source/lib/sysacls.c
+++ b/source/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/source/lib/system.c b/source/lib/system.c
index a402af77c9b..1dea1192d6c 100644
--- a/source/lib/system.c
+++ b/source/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/source/lib/time.c b/source/lib/time.c
index bf58cdd018a..d5813746112 100644
--- a/source/lib/time.c
+++ b/source/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/source/lib/username.c b/source/lib/username.c
index 5cd57e0ae50..2d1e8263030 100644
--- a/source/lib/username.c
+++ b/source/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/source/lib/util.c b/source/lib/util.c
index 26ca621fde2..572729b16d3 100644
--- a/source/lib/util.c
+++ b/source/lib/util.c
@@ -59,8 +59,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/source/lib/util_file.c b/source/lib/util_file.c
index f3d8afde5d4..d31f62036b4 100644
--- a/source/lib/util_file.c
+++ b/source/lib/util_file.c
@@ -19,8 +19,6 @@
 
 #include "includes.h"
 
-extern int DEBUGLEVEL;
-
 static int gotalarm;
 
 /***************************************************************
diff --git a/source/lib/util_seaccess.c b/source/lib/util_seaccess.c
index 860988aad57..16ace2fd205 100644
--- a/source/lib/util_seaccess.c
+++ b/source/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/source/lib/util_sec.c b/source/lib/util_sec.c
index 5b8bdb44c1b..cba0ab48210 100644
--- a/source/lib/util_sec.c
+++ b/source/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/source/lib/util_sid.c b/source/lib/util_sid.c
index 864d8a50d21..b6cbaa365ce 100644
--- a/source/lib/util_sid.c
+++ b/source/lib/util_sid.c
@@ -24,7 +24,6 @@
 #include "includes.h"
 
 
-extern int DEBUGLEVEL;
 DOM_SID global_sam_sid;
 extern pstring global_myname;
 extern fstring global_myworkgroup;
diff --git a/source/lib/util_sock.c b/source/lib/util_sock.c
index 9058cf9368c..2c052ab84da 100644
--- a/source/lib/util_sock.c
+++ b/source/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;
 
diff --git a/source/lib/util_str.c b/source/lib/util_str.c
index 32e2c40a7b4..c1b9876c17e 100644
--- a/source/lib/util_str.c
+++ b/source/lib/util_str.c
@@ -21,8 +21,6 @@
 
 #include "includes.h"
 
-extern int DEBUGLEVEL;
-
 static char *last_ptr=NULL;
 
 void set_first_token(char *ptr)
diff --git a/source/lib/util_unistr.c b/source/lib/util_unistr.c
index 9b3e25dd7ea..5213bb14975 100644
--- a/source/lib/util_unistr.c
+++ b/source/lib/util_unistr.c
@@ -21,8 +21,6 @@
 
 #include "includes.h"
 
-extern int DEBUGLEVEL;
-
  smb_ucs2_t wchar_list_sep[] = { (smb_ucs2_t)' ', (smb_ucs2_t)'\t', (smb_ucs2_t)',',
 								(smb_ucs2_t)';', (smb_ucs2_t)':', (smb_ucs2_t)'\n',
 								(smb_ucs2_t)'\r', 0 };