diff options
| author | Jeremy Allison <jra@samba.org> | 2001-10-20 21:23:52 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2001-10-20 21:23:52 +0000 |
| commit | ee1dc804fb1aa0c7ba3d0c2bb534a8965eaaf9dc (patch) | |
| tree | 0f80fb416f3830d6149a18a33538294d4676aeb7 | |
| parent | f34fc713c8e23e2cc8bd89c776f45e26ffb02c47 (diff) | |
| download | samba-ee1dc804fb1aa0c7ba3d0c2bb534a8965eaaf9dc.tar.gz samba-ee1dc804fb1aa0c7ba3d0c2bb534a8965eaaf9dc.tar.xz samba-ee1dc804fb1aa0c7ba3d0c2bb534a8965eaaf9dc.zip | |
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.
191 files changed, 1029 insertions, 1345 deletions
diff --git a/source/auth/pampass.c b/source/auth/pampass.c index dd9d38f66c3..4419c4d4f6c 100644 --- a/source/auth/pampass.c +++ b/source/auth/pampass.c @@ -30,8 +30,6 @@ #include "includes.h" -extern int DEBUGLEVEL; - #ifdef WITH_PAM /******************************************************************* diff --git a/source/auth/pass_check.c b/source/auth/pass_check.c index 76e069f5864..6ed41e20c6a 100644 --- a/source/auth/pass_check.c +++ b/source/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; static fstring this_salt; diff --git a/source/client/client.c b/source/client/client.c index d839155bcfc..0ef4179eb59 100644 --- a/source/client/client.c +++ b/source/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/source/client/clitar.c b/source/client/clitar.c index 335c92eecf1..fff390b8bee 100644 --- a/source/client/clitar.c +++ b/source/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; extern FILE *dbf; diff --git a/source/client/smbmount.c b/source/client/smbmount.c index 273a5fa85fd..8faee7958ed 100644 --- a/source/client/smbmount.c +++ b/source/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/source/groupdb/aliasdb.c b/source/groupdb/aliasdb.c index 536b4576bb1..33b9fcc37f5 100644 --- a/source/groupdb/aliasdb.c +++ b/source/groupdb/aliasdb.c @@ -22,8 +22,6 @@ #include "includes.h" -extern int DEBUGLEVEL; - extern fstring global_sam_name; /* diff --git a/source/groupdb/aliasfile.c b/source/groupdb/aliasfile.c index 2fb5a86a800..0844a420a0a 100644 --- a/source/groupdb/aliasfile.c +++ b/source/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/source/groupdb/groupdb.c b/source/groupdb/groupdb.c index 15d15667bd6..3bbc8f66d7c 100644 --- a/source/groupdb/groupdb.c +++ b/source/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/source/groupdb/groupfile.c b/source/groupdb/groupfile.c index 322bbcef7b7..7f3cec5c180 100644 --- a/source/groupdb/groupfile.c +++ b/source/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/source/include/proto.h b/source/include/proto.h index 0b7be0c5e94..1aabf2a5013 100644 --- a/source/include/proto.h +++ b/source/include/proto.h @@ -4087,7 +4087,8 @@ files_struct *file_new(connection_struct *conn); void file_close_conn(connection_struct *conn); void file_init(void); void file_close_user(int vuid); -files_struct *file_find_dit(SMB_DEV_T dev, SMB_INO_T inode, struct timeval *tval); +files_struct *file_find_fd(int fd); +files_struct *file_find_dif(SMB_DEV_T dev, SMB_INO_T inode, unsigned long file_id); files_struct *file_find_fsp(files_struct *orig_fsp); files_struct *file_find_di_first(SMB_DEV_T dev, SMB_INO_T inode); files_struct *file_find_di_next(files_struct *start_fsp); @@ -4195,8 +4196,7 @@ BOOL remove_oplock(files_struct *fsp, BOOL break_to_none); int setup_oplock_select_set( fd_set *fds); BOOL process_local_message(char *buffer, int buf_size); BOOL oplock_break_level2(files_struct *fsp, BOOL local_request, int token); -BOOL request_oplock_break(share_mode_entry *share_entry, - SMB_DEV_T dev, SMB_INO_T inode); +BOOL request_oplock_break(share_mode_entry *share_entry); BOOL attempt_close_oplocked_file(files_struct *fsp); void release_level_2_oplocks_on_change(files_struct *fsp); BOOL init_oplocks(void); diff --git a/source/include/smb.h b/source/include/smb.h index 1f8b4a42391..16b3e9314bc 100644 --- a/source/include/smb.h +++ b/source/include/smb.h @@ -369,6 +369,7 @@ typedef struct files_struct time_t pending_modtime; int oplock_type; int sent_oplock_break; + unsigned long file_id; BOOL can_lock; BOOL can_read; BOOL can_write; @@ -518,13 +519,15 @@ struct interface }; /* struct returned by get_share_modes */ -typedef struct -{ - pid_t pid; - uint16 op_port; - uint16 op_type; - int share_mode; - struct timeval time; +typedef struct { + pid_t pid; + uint16 op_port; + uint16 op_type; + int share_mode; + struct timeval time; + SMB_DEV_T dev; + SMB_INO_T inode; + unsigned long share_file_id; } share_mode_entry; @@ -1397,19 +1400,18 @@ extern int chain_size; * * The form of this is : * - * 0 2 6 10 14 14+devsize 14+devsize+inodesize - * +----+--------+--------+--------+-------+--------+ - * | cmd| pid | sec | usec | dev | inode | - * +----+--------+--------+--------+-------+--------+ + * 0 2 2+pid 2+pid+dev 2+pid+dev+ino + * +----+--------+-------+--------+---------+ + * | cmd| pid | dev | inode | fileid | + * +----+--------+-------+--------+---------+ */ #define OPLOCK_BREAK_CMD 0x1 #define OPLOCK_BREAK_PID_OFFSET 2 -#define OPLOCK_BREAK_SEC_OFFSET (OPLOCK_BREAK_PID_OFFSET + sizeof(pid_t)) -#define OPLOCK_BREAK_USEC_OFFSET (OPLOCK_BREAK_SEC_OFFSET + sizeof(time_t)) -#define OPLOCK_BREAK_DEV_OFFSET (OPLOCK_BREAK_USEC_OFFSET + sizeof(long)) +#define OPLOCK_BREAK_DEV_OFFSET (OPLOCK_BREAK_PID_OFFSET + sizeof(pid_t)) #define OPLOCK_BREAK_INODE_OFFSET (OPLOCK_BREAK_DEV_OFFSET + sizeof(SMB_DEV_T)) -#define OPLOCK_BREAK_MSG_LEN (OPLOCK_BREAK_INODE_OFFSET + sizeof(SMB_INO_T)) +#define OPLOCK_BREAK_FILEID_OFFSET (OPLOCK_BREAK_INODE_OFFSET + sizeof(SMB_INO_T)) +#define OPLOCK_BREAK_MSG_LEN (OPLOCK_BREAK_FILEID_OFFSET + sizeof(unsigned long)) #define KERNEL_OPLOCK_BREAK_CMD 0x2 #define LEVEL_II_OPLOCK_BREAK_CMD 0x3 @@ -1426,13 +1428,14 @@ extern int chain_size; * Form of this is : * * 0 2 2+devsize 2+devsize+inodesize - * +----+--------+--------+ - * | cmd| dev | inode | - * +----+--------+--------+ + * +----+--------+--------+----------+ + * | cmd| dev | inode | fileid | + * +----+--------+--------+----------+ */ #define KERNEL_OPLOCK_BREAK_DEV_OFFSET 2 #define KERNEL_OPLOCK_BREAK_INODE_OFFSET (KERNEL_OPLOCK_BREAK_DEV_OFFSET + sizeof(SMB_DEV_T)) -#define KERNEL_OPLOCK_BREAK_MSG_LEN (KERNEL_OPLOCK_BREAK_INODE_OFFSET + sizeof(SMB_INO_T)) +#define KERNEL_OPLOCK_BREAK_FILEID_OFFSET (KERNEL_OPLOCK_BREAK_INODE_OFFSET + sizeof(SMB_INO_T)) +#define KERNEL_OPLOCK_BREAK_MSG_LEN (KERNEL_OPLOCK_BREAK_FILEID_OFFSET + sizeof(unsigned long)) /* if a kernel does support oplocks then a structure of the following @@ -1441,7 +1444,7 @@ struct kernel_oplocks { BOOL (*receive_message)(fd_set *fds, char *buffer, int buffer_len); BOOL (*set_oplock)(files_struct *fsp, int oplock_type); void (*release_oplock)(files_struct *fsp); - BOOL (*parse_message)(char *msg_start, int msg_len, SMB_INO_T *inode, SMB_DEV_T *dev); + BOOL (*parse_message)(char *msg_start, int msg_len, SMB_INO_T *inode, SMB_DEV_T *dev, unsigned long *file_id); BOOL (*msg_waiting)(fd_set *fds); int notification_fd; }; 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 }; diff --git a/source/libsmb/clientgen.c b/source/libsmb/clientgen.c index 8d4a025fcc0..da43e4e2915 100644 --- a/source/libsmb/clientgen.c +++ b/source/libsmb/clientgen.c @@ -24,7 +24,6 @@ #include "includes.h" -extern int DEBUGLEVEL; static void cli_process_oplock(struct cli_state *cli); /* diff --git a/source/libsmb/clierror.c b/source/libsmb/clierror.c index 2f0c0e66184..0cdc7c383f6 100644 --- a/source/libsmb/clierror.c +++ b/source/libsmb/clierror.c @@ -24,9 +24,6 @@ #include "includes.h" -extern int DEBUGLEVEL; - - /***************************************************** RAP error codes - a small start but will be extended. *******************************************************/ diff --git a/source/libsmb/credentials.c b/source/libsmb/credentials.c index d4c87920686..5f65c13edd9 100644 --- a/source/libsmb/credentials.c +++ b/source/libsmb/credentials.c @@ -21,10 +21,6 @@ #include "includes.h" -extern int DEBUGLEVEL; - - - /**************************************************************************** represent a credential as a string ****************************************************************************/ diff --git a/source/libsmb/namequery.c b/source/libsmb/namequery.c index aa6301cc38e..88c549641a1 100644 --- a/source/libsmb/namequery.c +++ b/source/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/source/libsmb/nmblib.c b/source/libsmb/nmblib.c index 0a6bbe87e23..5b05058e647 100644 --- a/source/libsmb/nmblib.c +++ b/source/libsmb/nmblib.c @@ -22,8 +22,6 @@ #include "includes.h" -extern int DEBUGLEVEL; - int num_good_sends = 0; int num_good_receives = 0; diff --git a/source/libsmb/pwd_cache.c b/source/libsmb/pwd_cache.c index 420b49ed2e7..5266ff49b69 100644 --- a/source/libsmb/pwd_cache.c +++ b/source/libsmb/pwd_cache.c @@ -21,9 +21,6 @@ #include "includes.h" -extern int DEBUGLEVEL; - - /**************************************************************************** initialises a password structure ****************************************************************************/ diff --git a/source/libsmb/smbencrypt.c b/source/libsmb/smbencrypt.c index 872cc288769..1de2ca53084 100644 --- a/source/libsmb/smbencrypt.c +++ b/source/libsmb/smbencrypt.c @@ -22,8 +22,6 @@ #include "includes.h" -extern int DEBUGLEVEL; - #include "byteorder.h" /* diff --git a/source/libsmb/smberr.c b/source/libsmb/smberr.c index 9648786ea54..01bfd8e6a9b 100644 --- a/source/libsmb/smberr.c +++ b/source/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 */ diff --git a/source/libsmb/unexpected.c b/source/libsmb/unexpected.c index 8f115623a1c..71d807916ab 100644 --- a/source/libsmb/unexpected.c +++ b/source/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/source/locking/brlock.c b/source/locking/brlock.c index 7f91f664102..f6d77b6510d 100644 --- a/source/locking/brlock.c +++ b/source/locking/brlock.c @@ -28,8 +28,6 @@ #include "includes.h" -extern int DEBUGLEVEL; - /* This contains elements that differentiate locks. The smbpid is a client supplied pid, and is essentially the locking context for this client */ diff --git a/source/locking/locking.c b/source/locking/locking.c index b9bde167310..5064e2bd860 100644 --- a/source/locking/locking.c +++ b/source/locking/locking.c @@ -36,7 +36,6 @@ */ #include "includes.h" -extern int DEBUGLEVEL; uint16 global_smbpid; /* the locking database handle */ @@ -362,10 +361,6 @@ static TDB_DATA locking_key_fsp(files_struct *fsp) return locking_key(fsp->dev, fsp->inode); } -#ifndef LOCK_SHARE_ENTRY_SPIN_COUNT -#define LOCK_SHARE_ENTRY_SPIN_COUNT 100 -#endif - /******************************************************************* Lock a hash bucket entry. ******************************************************************/ @@ -449,6 +444,9 @@ static void fill_share_mode(char *p, files_struct *fsp, uint16 port, uint16 op_t e->op_port = port; e->op_type = op_type; memcpy(x, &fsp->open_time, sizeof(struct timeval)); + e->share_file_id = fsp->file_id; + e->dev = fsp->dev; + e->inode = fsp->inode; } /******************************************************************* @@ -458,10 +456,24 @@ static void fill_share_mode(char *p, files_struct *fsp, uint16 port, uint16 op_t BOOL share_modes_identical( share_mode_entry *e1, share_mode_entry *e2) { +#if 1 /* JRA PARANOIA TEST - REMOVE LATER */ + if (e1->pid == e2->pid && + e1->share_file_id == e2->share_file_id && + e1->dev == e2->dev && + e1->inode == e2->inode && + (e1->share_mode & ~DELETE_ON_CLOSE_FLAG) != (e2->share_mode & ~DELETE_ON_CLOSE_FLAG)) { + DEBUG(0,("PANIC: share_modes_identical: share_mode missmatch (e1 = %u, e2 = %u). Logic error.\n", + (unsigned int)(e1->share_mode & ~DELETE_ON_CLOSE_FLAG), + (unsigned int)(e2->share_mode & ~DELETE_ON_CLOSE_FLAG) )); + smb_panic("PANIC: share_modes_identical logic error.\n"); + } +#endif + return (e1->pid == e2->pid && (e1->share_mode & ~DELETE_ON_CLOSE_FLAG) == (e2->share_mode & ~DELETE_ON_CLOSE_FLAG) && - e1->time.tv_sec == e2->time.tv_sec && - e1->time.tv_usec == e2->time.tv_usec ); + e1->dev == e2->dev && + e1->inode == e2->inode && + e1->share_file_id == e2->share_file_id ); } /******************************************************************* diff --git a/source/locking/posix.c b/source/locking/posix.c index eb5e4b6460c..c6e47787944 100644 --- a/source/locking/posix.c +++ b/source/locking/posix.c @@ -24,7 +24,6 @@ */ #include "includes.h" -extern int DEBUGLEVEL; /* * The POSIX locking database handle. diff --git a/source/msdfs/msdfs.c b/source/msdfs/msdfs.c index cd93e5f6bc8..3b745e4f291 100644 --- a/source/msdfs/msdfs.c +++ b/source/msdfs/msdfs.c @@ -22,7 +22,6 @@ #include "includes.h" -extern int DEBUGLEVEL; extern pstring global_myname; extern uint32 global_client_caps; diff --git a/source/nmbd/asyncdns.c b/source/nmbd/asyncdns.c index 1fe04a39e37..5ae2eb202da 100644 --- a/source/nmbd/asyncdns.c +++ b/source/nmbd/asyncdns.c @@ -20,8 +20,6 @@ #include "includes.h" -extern int DEBUGLEVEL; - /*************************************************************************** Add a DNS result to the name cache. ****************************************************************************/ diff --git a/source/nmbd/nmbd.c b/source/nmbd/nmbd.c index 3e7b2171ec0..abc5d4865c4 100644 --- a/source/nmbd/nmbd.c +++ b/source/nmbd/nmbd.c @@ -27,8 +27,6 @@ #include "includes.h" -extern int DEBUGLEVEL; - extern pstring debugf; pstring servicesf = CONFIGFILE; diff --git a/source/nmbd/nmbd_become_dmb.c b/source/nmbd/nmbd_become_dmb.c index 76d92c2f3ed..6825643c85a 100644 --- a/source/nmbd/nmbd_become_dmb.c +++ b/source/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/source/nmbd/nmbd_become_lmb.c b/source/nmbd/nmbd_become_lmb.c index 31c67ae7f3f..52955d9bfc0 100644 --- a/source/nmbd/nmbd_become_lmb.c +++ b/source/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/source/nmbd/nmbd_browserdb.c b/source/nmbd/nmbd_browserdb.c index 10d22431e91..5b08207556a 100644 --- a/source/nmbd/nmbd_browserdb.c +++ b/source/nmbd/nmbd_browserdb.c @@ -30,8 +30,6 @@ #include "includes.h" -extern int DEBUGLEVEL; - /* -------------------------------------------------------------------------- ** * Variables... * diff --git a/source/nmbd/nmbd_browsesync.c b/source/nmbd/nmbd_browsesync.c index 23ca0a398f5..6a8edd0eaf0 100644 --- a/source/nmbd/nmbd_browsesync.c +++ b/source/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/source/nmbd/nmbd_elections.c b/source/nmbd/nmbd_elections.c index 0fc3ab9a896..6db595269f7 100644 --- a/source/nmbd/nmbd_elections.c +++ b/source/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/source/nmbd/nmbd_incomingdgrams.c b/source/nmbd/nmbd_incomingdgrams.c index dd1559c62c3..d9d1894534d 100644 --- a/source/nmbd/nmbd_incomingdgrams.c +++ b/source/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/source/nmbd/nmbd_incomingrequests.c b/source/nmbd/nmbd_incomingrequests.c index 82cda38c7f8..27538834147 100644 --- a/source/nmbd/nmbd_incomingrequests.c +++ b/source/nmbd/nmbd_incomingrequests.c @@ -28,7 +28,6 @@ #include "includes.h" -extern int DEBUGLEVEL; extern fstring global_myworkgroup; /**************************************************************************** diff --git a/source/nmbd/nmbd_lmhosts.c b/source/nmbd/nmbd_lmhosts.c index 158988813b7..8eb198020f7 100644 --- a/source/nmbd/nmbd_lmhosts.c +++ b/source/nmbd/nmbd_lmhosts.c @@ -26,8 +26,6 @@ #include "includes.h" -extern int DEBUGLEVEL; - /**************************************************************************** Load a lmhosts file. ****************************************************************************/ diff --git a/source/nmbd/nmbd_logonnames.c b/source/nmbd/nmbd_logonnames.c index c63de56a34a..4f48b21b7fd 100644 --- a/source/nmbd/nmbd_logonnames.c +++ b/source/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/source/nmbd/nmbd_mynames.c b/source/nmbd/nmbd_mynames.c index 7672417786a..7f9a3441a8c 100644 --- a/source/nmbd/nmbd_mynames.c +++ b/source/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/source/nmbd/nmbd_namelistdb.c b/source/nmbd/nmbd_namelistdb.c index 15328af33eb..7c8618ae4d2 100644 --- a/source/nmbd/nmbd_namelistdb.c +++ b/source/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/source/nmbd/nmbd_namequery.c b/source/nmbd/nmbd_namequery.c index b497526475e..1f0895ee37f 100644 --- a/source/nmbd/nmbd_namequery.c +++ b/source/nmbd/nmbd_namequery.c @@ -24,7 +24,6 @@ #include "includes.h" -extern int DEBUGLEVEL; extern struct in_addr ipzero; /**************************************************************************** diff --git a/source/nmbd/nmbd_nameregister.c b/source/nmbd/nmbd_nameregister.c index 6154f06edde..ad080397ec6 100644 --- a/source/nmbd/nmbd_nameregister.c +++ b/source/nmbd/nmbd_nameregister.c @@ -24,8 +24,6 @@ #include "includes.h" -extern int DEBUGLEVEL; - extern fstring global_myworkgroup; /**************************************************************************** diff --git a/source/nmbd/nmbd_namerelease.c b/source/nmbd/nmbd_namerelease.c index 0f693c63d02..30a9d165612 100644 --- a/source/nmbd/nmbd_namerelease.c +++ b/source/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/source/nmbd/nmbd_nodestatus.c b/source/nmbd/nmbd_nodestatus.c index d28ea1cff4e..eeb532d4109 100644 --- a/source/nmbd/nmbd_nodestatus.c +++ b/source/nmbd/nmbd_nodestatus.c @@ -24,8 +24,6 @@ #include "includes.h" -extern int DEBUGLEVEL; - /**************************************************************************** Deal with a successful node status response. ****************************************************************************/ diff --git a/source/nmbd/nmbd_packets.c b/source/nmbd/nmbd_packets.c index 00059c1775e..7ba4dd6da95 100644 --- a/source/nmbd/nmbd_packets.c +++ b/source/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/source/nmbd/nmbd_processlogon.c b/source/nmbd/nmbd_processlogon.c index 3699754c885..c9130fe478c 100644 --- a/source/nmbd/nmbd_processlogon.c +++ b/source/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/source/nmbd/nmbd_responserecordsdb.c b/source/nmbd/nmbd_responserecordsdb.c index 1b6e1ca16db..93b48d06f12 100644 --- a/source/nmbd/nmbd_responserecordsdb.c +++ b/source/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/source/nmbd/nmbd_sendannounce.c b/source/nmbd/nmbd_sendannounce.c index 87115a1eb0d..72becf58617 100644 --- a/source/nmbd/nmbd_sendannounce.c +++ b/source/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/source/nmbd/nmbd_serverlistdb.c b/source/nmbd/nmbd_serverlistdb.c index 41009bc68f0..26b0cddcea0 100644 --- a/source/nmbd/nmbd_serverlistdb.c +++ b/source/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/source/nmbd/nmbd_subnetdb.c b/source/nmbd/nmbd_subnetdb.c index 3bad3f9568a..33b4b050f06 100644 --- a/source/nmbd/nmbd_subnetdb.c +++ b/source/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/source/nmbd/nmbd_synclists.c b/source/nmbd/nmbd_synclists.c index 4afb730519a..8670a45a680 100644 --- a/source/nmbd/nmbd_synclists.c +++ b/source/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/source/nmbd/nmbd_winsproxy.c b/source/nmbd/nmbd_winsproxy.c index 24ba192cdb3..2f50881d297 100644 --- a/source/nmbd/nmbd_winsproxy.c +++ b/source/nmbd/nmbd_winsproxy.c @@ -23,8 +23,6 @@ #include "includes.h" -extern int DEBUGLEVEL; - /**************************************************************************** Function called when the name lookup succeeded. ****************************************************************************/ diff --git a/source/nmbd/nmbd_winsserver.c b/source/nmbd/nmbd_winsserver.c index 296102fd99c..8be182563a7 100644 --- a/source/nmbd/nmbd_winsserver.c +++ b/source/nmbd/nmbd_winsserver.c @@ -26,7 +26,6 @@ #define WINS_LIST "wins.dat" #define WINS_VERSION 1 -extern int DEBUGLEVEL; extern struct in_addr ipzero; diff --git a/source/nmbd/nmbd_workgroupdb.c b/source/nmbd/nmbd_workgroupdb.c index 01477c81133..baa40dc1f9e 100644 --- a/source/nmbd/nmbd_workgroupdb.c +++ b/source/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/source/nsswitch/wins.c b/source/nsswitch/wins.c index cd32aba88db..920fd519d4b 100644 --- a/source/nsswitch/wins.c +++ b/source/nsswitch/wins.c @@ -24,8 +24,6 @@ #include "includes.h" -extern int DEBUGLEVEL; - #ifndef INADDRSZ #define INADDRSZ 4 #endif diff --git a/source/param/params.c b/source/param/params.c index 2bc32f1c66d..36deddf43e8 100644 --- a/source/param/params.c +++ b/source/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/source/passdb/pampass.c b/source/passdb/pampass.c index dd9d38f66c3..4419c4d4f6c 100644 --- a/source/passdb/pampass.c +++ b/source/passdb/pampass.c @@ -30,8 +30,6 @@ #include "includes.h" -extern int DEBUGLEVEL; - #ifdef WITH_PAM /******************************************************************* diff --git a/source/passdb/pass_check.c b/source/passdb/pass_check.c index 76e069f5864..6ed41e20c6a 100644 --- a/source/passdb/pass_check.c +++ b/source/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; static fstring this_salt; diff --git a/source/passdb/passdb.c b/source/passdb/passdb.c index 37da884a67f..00b62455578 100644 --- a/source/passdb/passdb.c +++ b/source/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/source/passdb/passgrp.c b/source/passdb/passgrp.c index 399a45d8a9a..fe5b181e33c 100644 --- a/source/passdb/passgrp.c +++ b/source/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. diff --git a/source/passdb/pdb_ldap.c b/source/passdb/pdb_ldap.c index 1a1dc0915ea..d44a6133f37 100644 --- a/source/passdb/pdb_ldap.c +++ b/source/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/source/passdb/pdb_smbpasswd.c b/source/passdb/pdb_smbpasswd.c index d29a4bfcaf0..b2c2434c07a 100644 --- a/source/passdb/pdb_smbpasswd.c +++ b/source/passdb/pdb_smbpasswd.c @@ -44,7 +44,6 @@ struct smb_passwd }; -extern int DEBUGLEVEL; extern pstring samlogon_user; extern BOOL sam_logon_in_ssb; extern struct passdb_ops pdb_ops; diff --git a/source/passdb/smbpass.c b/source/passdb/smbpass.c index 61e31f62f73..9db74557ecc 100644 --- a/source/passdb/smbpass.c +++ b/source/passdb/smbpass.c @@ -21,7 +21,6 @@ #ifdef USE_SMBPASS_DB -extern int DEBUGLEVEL; extern pstring samlogon_user; extern BOOL sam_logon_in_ssb; diff --git a/source/passdb/smbpassfile.c b/source/passdb/smbpassfile.c index e4b11dbf76a..d931478839d 100644 --- a/source/passdb/smbpassfile.c +++ b/source/passdb/smbpassfile.c @@ -27,7 +27,6 @@ #include "includes.h" -extern int DEBUGLEVEL; extern pstring global_myname; diff --git a/source/passdb/smbpassgroup.c b/source/passdb/smbpassgroup.c index 4636c08c949..b332c9da7f5 100644 --- a/source/passdb/smbpassgroup.c +++ b/source/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/source/printing/lpq_parse.c b/source/printing/lpq_parse.c index a143709570b..edb56f49be4 100644 --- a/source/printing/lpq_parse.c +++ b/source/printing/lpq_parse.c @@ -20,7 +20,6 @@ */ #include "includes.h" -extern int DEBUGLEVEL; static char *Months[13] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun", diff --git a/source/printing/nt_printing.c b/source/printing/nt_printing.c index 7273a14e40f..11c332cff71 100644 --- a/source/printing/nt_printing.c +++ b/source/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/source/printing/pcap.c b/source/printing/pcap.c index cead9f919e9..34bd8db981b 100644 --- a/source/printing/pcap.c +++ b/source/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/source/printing/print_cups.c b/source/printing/print_cups.c index 565caff30ac..9b8684ed295 100644 --- a/source/printing/print_cups.c +++ b/source/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/source/printing/print_generic.c b/source/printing/print_generic.c index ef38d26493c..741a4db2391 100644 --- a/source/printing/print_generic.c +++ b/source/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/source/printing/print_svid.c b/source/printing/print_svid.c index 5d81843b87b..c4c8945ea86 100644 --- a/source/printing/print_svid.c +++ b/source/printing/print_svid.c @@ -37,8 +37,6 @@ #ifdef SYSV -extern int DEBUGLEVEL; - typedef struct printer { char *name; struct printer *next; diff --git a/source/printing/printfsp.c b/source/printing/printfsp.c index 6545dc59c22..322deadf0fa 100644 --- a/source/printing/printfsp.c +++ b/source/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/source/printing/printing.c b/source/printing/printing.c index 19d6aa2f70c..abf93dc8612 100644 --- a/source/printing/printing.c +++ b/source/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/source/profile/profile.c b/source/profile/profile.c index 430732c6f86..8f76b5a0465 100644 --- a/source/profile/profile.c +++ b/source/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; diff --git a/source/rpc_client/cli_connect.c b/source/rpc_client/cli_connect.c index c8021b97927..b1606ae3345 100644 --- a/source/rpc_client/cli_connect.c +++ b/source/rpc_client/cli_connect.c @@ -33,7 +33,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 diff --git a/source/rpc_client/cli_login.c b/source/rpc_client/cli_login.c index 40d6464c56d..26c69c802e4 100644 --- a/source/rpc_client/cli_login.c +++ b/source/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/source/rpc_client/cli_lsarpc.c b/source/rpc_client/cli_lsarpc.c index 29c6da172e3..23e709214fc 100644 --- a/source/rpc_client/cli_lsarpc.c +++ b/source/rpc_client/cli_lsarpc.c @@ -24,8 +24,6 @@ #include "includes.h" -extern int DEBUGLEVEL; - /**************************************************************************** do a LSA Open Policy ****************************************************************************/ diff --git a/source/rpc_client/cli_netlogon.c b/source/rpc_client/cli_netlogon.c index 5f58f16d498..0515ba561ae 100644 --- a/source/rpc_client/cli_netlogon.c +++ b/source/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/source/rpc_client/cli_pipe.c b/source/rpc_client/cli_pipe.c index 4bbbac17ed3..15acc933032 100644 --- a/source/rpc_client/cli_pipe.c +++ b/source/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/source/rpc_client/cli_spoolss_notify.c b/source/rpc_client/cli_spoolss_notify.c index 2f712f6adbc..27adac4a652 100644 --- a/source/rpc_client/cli_spoolss_notify.c +++ b/source/rpc_client/cli_spoolss_notify.c @@ -25,7 +25,6 @@ #include "rpc_client.h" #include "nterr.h" -extern int DEBUGLEVEL; extern pstring global_myname; /********************************************************* diff --git a/source/rpc_client/cli_use.c b/source/rpc_client/cli_use.c index 93560e9772b..ee6e7ea8abf 100644 --- a/source/rpc_client/cli_use.c +++ b/source/rpc_client/cli_use.c @@ -26,7 +26,6 @@ #include "trans2.h" #include "rpc_client.h" -extern int DEBUGLEVEL; extern pstring scope; extern pstring global_myname; diff --git a/source/rpc_client/ncacn_np_use.c b/source/rpc_client/ncacn_np_use.c index 1a3938b6e9d..7eec2fd44c6 100644 --- a/source/rpc_client/ncacn_np_use.c +++ b/source/rpc_client/ncacn_np_use.c @@ -28,7 +28,6 @@ #include "rpc_client.h" #include "trans2.h" -extern int DEBUGLEVEL; extern pstring global_myname; struct ncacn_np_use diff --git a/source/rpc_parse/parse_creds.c b/source/rpc_parse/parse_creds.c index fcc8e59d100..1f645079927 100644 --- a/source/rpc_parse/parse_creds.c +++ b/source/rpc_parse/parse_creds.c @@ -24,9 +24,6 @@ #include "includes.h" -extern int DEBUGLEVEL; - - /******************************************************************* makes a CREDS_UNIX structure. ********************************************************************/ diff --git a/source/rpc_parse/parse_dfs.c b/source/rpc_parse/parse_dfs.c index 7e0959d2f35..860bde58e3a 100644 --- a/source/rpc_parse/parse_dfs.c +++ b/source/rpc_parse/parse_dfs.c @@ -26,8 +26,6 @@ #include "nterr.h" #include "rpc_parse.h" -extern int DEBUGLEVEL; - /************************************************************* Read/write a DFS_Q_DFS_EXIST structure - dummy... ************************************************************/ diff --git a/source/rpc_parse/parse_lsa.c b/source/rpc_parse/parse_lsa.c index 5128bb1dbbc..74f30011e50 100644 --- a/source/rpc_parse/parse_lsa.c +++ b/source/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); /******************************************************************* diff --git a/source/rpc_parse/parse_misc.c b/source/rpc_parse/parse_misc.c index 541738413a0..9f87ff4b141 100644 --- a/source/rpc_parse/parse_misc.c +++ b/source/rpc_parse/parse_misc.c @@ -24,8 +24,6 @@ #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/source/rpc_parse/parse_net.c b/source/rpc_parse/parse_net.c index a4964e4b422..620ec2db879 100644 --- a/source/rpc_parse/parse_net.c +++ b/source/rpc_parse/parse_net.c @@ -23,8 +23,6 @@ #include "includes.h" -extern int DEBUGLEVEL; - /******************************************************************* Reads or writes a structure. ********************************************************************/ diff --git a/source/rpc_parse/parse_prs.c b/source/rpc_parse/parse_prs.c index 6bab18ba9d7..9a804e7b634 100644 --- a/source/rpc_parse/parse_prs.c +++ b/source/rpc_parse/parse_prs.c @@ -21,8 +21,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -extern int DEBUGLEVEL; - #include "includes.h" diff --git a/source/rpc_parse/parse_reg.c b/source/rpc_parse/parse_reg.c index a7602434e54..f7250808e5c 100644 --- a/source/rpc_parse/parse_reg.c +++ b/source/rpc_parse/parse_reg.c @@ -25,9 +25,6 @@ #include "includes.h" -extern int DEBUGLEVEL; - - /******************************************************************* Inits a structure. ********************************************************************/ diff --git a/source/rpc_parse/parse_rpc.c b/source/rpc_parse/parse_rpc.c index f330c5947e6..cf48bfbbd1e 100644 --- a/source/rpc_parse/parse_rpc.c +++ b/source/rpc_parse/parse_rpc.c @@ -26,9 +26,6 @@ #include "includes.h" -extern int DEBUGLEVEL; - - /******************************************************************* interface/version dce/rpc pipe identification ********************************************************************/ diff --git a/source/rpc_parse/parse_samr.c b/source/rpc_parse/parse_samr.c index e0e61efffaa..37908470af1 100644 --- a/source/rpc_parse/parse_samr.c +++ b/source/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/source/rpc_parse/parse_sec.c b/source/rpc_parse/parse_sec.c index b202c2a3566..91b85993d6d 100644 --- a/source/rpc_parse/parse_sec.c +++ b/source/rpc_parse/parse_sec.c @@ -25,8 +25,6 @@ #include "includes.h" -extern int DEBUGLEVEL; - #define SD_HEADER_SIZE 0x14 /******************************************************************* diff --git a/source/rpc_parse/parse_spoolss.c b/source/rpc_parse/parse_spoolss.c index cbdd961066d..5794db839a0 100644 --- a/source/rpc_parse/parse_spoolss.c +++ b/source/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/source/rpc_parse/parse_srv.c b/source/rpc_parse/parse_srv.c index 637b8342660..c28daea33ff 100644 --- a/source/rpc_parse/parse_srv.c +++ b/source/rpc_parse/parse_srv.c @@ -25,8 +25,6 @@ #include "includes.h" -extern int DEBUGLEVEL; - /******************************************************************* Inits a SH_INFO_1_STR structure ********************************************************************/ diff --git a/source/rpc_parse/parse_wks.c b/source/rpc_parse/parse_wks.c index 7357e3d2f3a..efc5ebd0672 100644 --- a/source/rpc_parse/parse_wks.c +++ b/source/rpc_parse/parse_wks.c @@ -25,8 +25,6 @@ #include "includes.h" -extern int DEBUGLEVEL; - /******************************************************************* Init ********************************************************************/ diff --git a/source/rpc_server/srv_dfs.c b/source/rpc_server/srv_dfs.c index fe797e84f6e..6b48a46b466 100644 --- a/source/rpc_server/srv_dfs.c +++ b/source/rpc_server/srv_dfs.c @@ -29,7 +29,6 @@ #define MAX_MSDFS_JUNCTIONS 256 -extern int DEBUGLEVEL; extern pstring global_myname; #ifdef WITH_MSDFS diff --git a/source/rpc_server/srv_dfs_nt.c b/source/rpc_server/srv_dfs_nt.c index 9bc12e2a965..a48bccd793a 100644 --- a/source/rpc_server/srv_dfs_nt.c +++ b/source/rpc_server/srv_dfs_nt.c @@ -27,7 +27,6 @@ #include "includes.h" #include "nterr.h" -extern int DEBUGLEVEL; extern pstring global_myname; #ifdef WITH_MSDFS diff --git a/source/rpc_server/srv_lsa.c b/source/rpc_server/srv_lsa.c index 005398924ee..ed24e372ec6 100644 --- a/source/rpc_server/srv_lsa.c +++ b/source/rpc_server/srv_lsa.c @@ -26,8 +26,6 @@ #include "includes.h" -extern int DEBUGLEVEL; - /*************************************************************************** api_lsa_open_policy2 ***************************************************************************/ diff --git a/source/rpc_server/srv_lsa_hnd.c b/source/rpc_server/srv_lsa_hnd.c index 393f50a498e..bce9e68a56f 100644 --- a/source/rpc_server/srv_lsa_hnd.c +++ b/source/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/source/rpc_server/srv_lsa_nt.c b/source/rpc_server/srv_lsa_nt.c index a14a479984b..8c5cf895216 100644 --- a/source/rpc_server/srv_lsa_nt.c +++ b/source/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/source/rpc_server/srv_netlog.c b/source/rpc_server/srv_netlog.c index 4c13ad0c670..0190602a79c 100644 --- a/source/rpc_server/srv_netlog.c +++ b/source/rpc_server/srv_netlog.c @@ -26,8 +26,6 @@ #include "includes.h" -extern int DEBUGLEVEL; - /************************************************************************* api_net_req_chal: *************************************************************************/ diff --git a/source/rpc_server/srv_netlog_nt.c b/source/rpc_server/srv_netlog_nt.c index 62c49f5b89a..ca52d991026 100644 --- a/source/rpc_server/srv_netlog_nt.c +++ b/source/rpc_server/srv_netlog_nt.c @@ -26,8 +26,6 @@ #include "includes.h" -extern int DEBUGLEVEL; - extern BOOL sam_logon_in_ssb; extern pstring samlogon_user; extern pstring global_myname; diff --git a/source/rpc_server/srv_pipe.c b/source/rpc_server/srv_pipe.c index 2f79e63bc60..ecc1fe4a7c0 100644 --- a/source/rpc_server/srv_pipe.c +++ b/source/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/source/rpc_server/srv_pipe_hnd.c b/source/rpc_server/srv_pipe_hnd.c index c9fb06da4db..8658f347d8a 100644 --- a/source/rpc_server/srv_pipe_hnd.c +++ b/source/rpc_server/srv_pipe_hnd.c @@ -28,7 +28,6 @@ #define PIPE "\\PIPE\\" #define PIPELEN strlen(PIPE) -extern int DEBUGLEVEL; static pipes_struct *chain_p; static int pipes_open; diff --git a/source/rpc_server/srv_reg.c b/source/rpc_server/srv_reg.c index 2a0e2d172ce..84714ddc4ee 100644 --- a/source/rpc_server/srv_reg.c +++ b/source/rpc_server/srv_reg.c @@ -27,8 +27,6 @@ #include "includes.h" -extern int DEBUGLEVEL; - /******************************************************************* api_reg_close ********************************************************************/ diff --git a/source/rpc_server/srv_reg_nt.c b/source/rpc_server/srv_reg_nt.c index c3b4a1a7a5d..ef541a17240 100644 --- a/source/rpc_server/srv_reg_nt.c +++ b/source/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/source/rpc_server/srv_samr.c b/source/rpc_server/srv_samr.c index cd1cc6926fc..0cb1fa231f7 100644 --- a/source/rpc_server/srv_samr.c +++ b/source/rpc_server/srv_samr.c @@ -32,8 +32,6 @@ #include "includes.h" -extern int DEBUGLEVEL; - /******************************************************************* api_samr_close_hnd ********************************************************************/ diff --git a/source/rpc_server/srv_samr_nt.c b/source/rpc_server/srv_samr_nt.c index 9c2f37d4ce0..772b5c12d12 100644 --- a/source/rpc_server/srv_samr_nt.c +++ b/source/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/source/rpc_server/srv_spoolss.c b/source/rpc_server/srv_spoolss.c index 011efb1bace..34fc8c01c6a 100755 --- a/source/rpc_server/srv_spoolss.c +++ b/source/rpc_server/srv_spoolss.c @@ -24,8 +24,6 @@ #include "includes.h" -extern int DEBUGLEVEL; - /******************************************************************** * api_spoolss_open_printer_ex ********************************************************************/ diff --git a/source/rpc_server/srv_spoolss_nt.c b/source/rpc_server/srv_spoolss_nt.c index 86f4fe77ac3..6e181e173b7 100644 --- a/source/rpc_server/srv_spoolss_nt.c +++ b/source/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/source/rpc_server/srv_srvsvc.c b/source/rpc_server/srv_srvsvc.c index fe008d0dde8..35bacc3458d 100644 --- a/source/rpc_server/srv_srvsvc.c +++ b/source/rpc_server/srv_srvsvc.c @@ -26,8 +26,6 @@ #include "includes.h" -extern int DEBUGLEVEL; - /******************************************************************* api_srv_net_srv_get_info ********************************************************************/ diff --git a/source/rpc_server/srv_srvsvc_nt.c b/source/rpc_server/srv_srvsvc_nt.c index 6434e0476d6..64fae5547fb 100644 --- a/source/rpc_server/srv_srvsvc_nt.c +++ b/source/rpc_server/srv_srvsvc_nt.c @@ -26,7 +26,6 @@ #include "includes.h" -extern int DEBUGLEVEL; extern pstring global_myname; /******************************************************************* diff --git a/source/rpc_server/srv_util.c b/source/rpc_server/srv_util.c index 22e573402e9..f6169e0bef2 100644 --- a/source/rpc_server/srv_util.c +++ b/source/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/source/rpc_server/srv_wkssvc.c b/source/rpc_server/srv_wkssvc.c index 12e4a8f3359..3661824da17 100644 --- a/source/rpc_server/srv_wkssvc.c +++ b/source/rpc_server/srv_wkssvc.c @@ -25,8 +25,6 @@ #include "includes.h" -extern int DEBUGLEVEL; - /******************************************************************* api_wks_query_info ********************************************************************/ diff --git a/source/rpc_server/srv_wkssvc_nt.c b/source/rpc_server/srv_wkssvc_nt.c index c20ebb57067..dd7ac0dab7e 100644 --- a/source/rpc_server/srv_wkssvc_nt.c +++ b/source/rpc_server/srv_wkssvc_nt.c @@ -26,7 +26,6 @@ #include "includes.h" -extern int DEBUGLEVEL; extern pstring global_myname; /******************************************************************* diff --git a/source/rpcclient/cmd_lsarpc.c b/source/rpcclient/cmd_lsarpc.c index 5fe8509b215..1e110dfff79 100644 --- a/source/rpcclient/cmd_lsarpc.c +++ b/source/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/source/rpcclient/cmd_netlogon.c b/source/rpcclient/cmd_netlogon.c index 375f6765665..f342ef50b73 100644 --- a/source/rpcclient/cmd_netlogon.c +++ b/source/rpcclient/cmd_netlogon.c @@ -22,8 +22,6 @@ #include "includes.h" -extern int DEBUGLEVEL; - static uint32 cmd_netlogon_logon_ctrl2(struct cli_state *cli, int argc, char **argv) { diff --git a/source/rpcclient/cmd_spoolss.c b/source/rpcclient/cmd_spoolss.c index d8f7cf33ae2..d834749635e 100644 --- a/source/rpcclient/cmd_spoolss.c +++ b/source/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/source/rpcclient/cmd_srvsvc.c b/source/rpcclient/cmd_srvsvc.c index 0f1289f2750..37ff2a050a3 100644 --- a/source/rpcclient/cmd_srvsvc.c +++ b/source/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/source/rpcclient/rpcclient.c b/source/rpcclient/rpcclient.c index 9785b2c309b..0c59296a48a 100644 --- a/source/rpcclient/rpcclient.c +++ b/source/rpcclient/rpcclient.c @@ -22,7 +22,6 @@ #include "includes.h" -extern int DEBUGLEVEL; extern pstring debugf; DOM_SID domain_sid; diff --git a/source/smbd/blocking.c b/source/smbd/blocking.c index e2d0363e08e..f3c1b4442a6 100644 --- a/source/smbd/blocking.c +++ b/source/smbd/blocking.c @@ -20,7 +20,6 @@ */ #include "includes.h" -extern int DEBUGLEVEL; extern char *OutBuffer; /**************************************************************************** diff --git a/source/smbd/chgpasswd.c b/source/smbd/chgpasswd.c index 245c1d1ea9b..04725b1b83d 100644 --- a/source/smbd/chgpasswd.c +++ b/source/smbd/chgpasswd.c @@ -49,7 +49,6 @@ #include "includes.h" -extern int DEBUGLEVEL; extern struct passdb_ops pdb_ops; #if ALLOW_CHANGE_PASSWORD diff --git a/source/smbd/close.c b/source/smbd/close.c index 7c0672efe0d..7fd5ef1d438 100644 --- a/source/smbd/close.c +++ b/source/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/source/smbd/conn.c b/source/smbd/conn.c index 725ab22dc44..ba1efca3f76 100644 --- a/source/smbd/conn.c +++ b/source/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/source/smbd/connection.c b/source/smbd/connection.c index b2f42dec012..540ec78b0a7 100644 --- a/source/smbd/connection.c +++ b/source/smbd/connection.c @@ -25,8 +25,6 @@ extern fstring remote_machine; static TDB_CONTEXT *tdb; -extern int DEBUGLEVEL; - /**************************************************************************** Return the connection tdb context (used for message send all). ****************************************************************************/ diff --git a/source/smbd/dfree.c b/source/smbd/dfree.c index 64c6182cd8d..034e1a093d3 100644 --- a/source/smbd/dfree.c +++ b/source/smbd/dfree.c @@ -21,9 +21,6 @@ #include "includes.h" - -extern int DEBUGLEVEL; - /**************************************************************************** normalise for DOS usage ****************************************************************************/ diff --git a/source/smbd/dir.c b/source/smbd/dir.c index fa9cbdc4a2a..fe593a98051 100644 --- a/source/smbd/dir.c +++ b/source/smbd/dir.c @@ -21,8 +21,6 @@ #include "includes.h" -extern int DEBUGLEVEL; - /* This module implements directory related functions for Samba. */ diff --git a/source/smbd/dosmode.c b/source/smbd/dosmode.c index 9ec1fa26069..d7b40198771 100644 --- a/source/smbd/dosmode.c +++ b/source/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/source/smbd/error.c b/source/smbd/error.c index 6f945ca8ffe..d2f339f8326 100644 --- a/source/smbd/error.c +++ b/source/smbd/error.c @@ -21,7 +21,6 @@ #include "includes.h" -extern int DEBUGLEVEL; extern uint32 global_client_caps; /* these can be set by some functions to override the error codes */ diff --git a/source/smbd/fileio.c b/source/smbd/fileio.c index c79f0aa89e0..91c21f8a684 100644 --- a/source/smbd/fileio.c +++ b/source/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/source/smbd/filename.c b/source/smbd/filename.c index bdbcd81b644..e2d27575b12 100644 --- a/source/smbd/filename.c +++ b/source/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/source/smbd/files.c b/source/smbd/files.c index 27dfad7c483..c845cb19c4b 100644 --- a/source/smbd/files.c +++ b/source/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)) @@ -41,8 +39,22 @@ static files_struct *oplock_save_chain_fsp = NULL; static int files_used; /**************************************************************************** - find first available file slot + Return a unique number identifying this fsp over the life of this pid. +****************************************************************************/ + +static unsigned long get_gen_count(void) +{ + static unsigned long file_gen_counter; + + if ((++file_gen_counter) == 0) + return ++file_gen_counter; + return file_gen_counter; +} + +/**************************************************************************** + Find first available file slot. ****************************************************************************/ + files_struct *file_new(connection_struct *conn) { int i; @@ -92,6 +104,8 @@ files_struct *file_new(connection_struct *conn) ZERO_STRUCTP(fsp); fsp->fd = -1; fsp->conn = conn; + fsp->file_id = get_gen_count(); + GetTimeOfDay(&fsp->open_time); first_file = (i+1) % real_max_open_files; @@ -111,10 +125,10 @@ files_struct *file_new(connection_struct *conn) return fsp; } - /**************************************************************************** -close all open files for a connection + Close all open files for a connection. ****************************************************************************/ + void file_close_conn(connection_struct *conn) { files_struct *fsp, *next; @@ -128,7 +142,7 @@ void file_close_conn(connection_struct *conn) } /**************************************************************************** -initialise file structures + Initialise file structures. ****************************************************************************/ #define MAX_OPEN_FUDGEFACTOR 10 @@ -164,10 +178,10 @@ open files, %d are available.\n", request_max_open_files, real_max_open_files)); set_pipe_handle_offset(real_max_open_files); } - /**************************************************************************** -close files open by a specified vuid + Close files open by a specified vuid. ****************************************************************************/ + void file_close_user(int vuid) { files_struct *fsp, *next; @@ -180,13 +194,32 @@ void file_close_user(int vuid) } } +/**************************************************************************** + Find a fsp given a file descriptor. +****************************************************************************/ + +files_struct *file_find_fd(int fd) +{ + int count=0; + files_struct *fsp; + + for (fsp=Files;fsp;fsp=fsp->next,count++) { + if (fsp->fd == fd) { + if (count > 10) { + DLIST_PROMOTE(Files, fsp); + } + return fsp; + } + } + + return NULL; +} /**************************************************************************** - Find a fsp given a device, inode and timevalue - If this is from a kernel oplock break request then tval may be NULL. + Find a fsp given a device, inode and file_id. ****************************************************************************/ -files_struct *file_find_dit(SMB_DEV_T dev, SMB_INO_T inode, struct timeval *tval) +files_struct *file_find_dif(SMB_DEV_T dev, SMB_INO_T inode, unsigned long file_id) { int count=0; files_struct *fsp; @@ -195,8 +228,7 @@ files_struct *file_find_dit(SMB_DEV_T dev, SMB_INO_T inode, struct timeval *tval if (fsp->fd != -1 && fsp->dev == dev && fsp->inode == inode && - (tval ? (fsp->open_time.tv_sec == tval->tv_sec) : True ) && - (tval ? (fsp->open_time.tv_usec == tval->tv_usec) : True )) { + fsp->file_id == file_id ) { if (count > 10) { DLIST_PROMOTE(Files, fsp); } @@ -260,8 +292,9 @@ files_struct *file_find_di_next(files_struct *start_fsp) } /**************************************************************************** -find a fsp that is open for printing + Find a fsp that is open for printing. ****************************************************************************/ + files_struct *file_find_print(void) { files_struct *fsp; @@ -273,10 +306,10 @@ files_struct *file_find_print(void) return NULL; } - /**************************************************************************** -sync open files on a connection + Sync open files on a connection. ****************************************************************************/ + void file_sync_all(connection_struct *conn) { files_struct *fsp, *next; @@ -289,10 +322,10 @@ void file_sync_all(connection_struct *conn) } } - /**************************************************************************** -free up a fsp + Free up a fsp. ****************************************************************************/ + void file_free(files_struct *fsp) { DLIST_REMOVE(Files, fsp); @@ -314,16 +347,17 @@ void file_free(files_struct *fsp) free(fsp); } - /**************************************************************************** -get a fsp from a packet given the offset of a 16 bit fnum + Get a fsp from a packet given the offset of a 16 bit fnum. ****************************************************************************/ + files_struct *file_fsp(char *buf, int where) { int fnum, count=0; files_struct *fsp; - if (chain_fsp) return chain_fsp; + if (chain_fsp) + return chain_fsp; fnum = SVAL(buf, where); @@ -340,7 +374,7 @@ files_struct *file_fsp(char *buf, int where) } /**************************************************************************** - Reset the chained fsp - done at the start of a packet reply + Reset the chained fsp - done at the start of a packet reply. ****************************************************************************/ void file_chain_reset(void) @@ -360,6 +394,7 @@ void file_chain_save(void) /**************************************************************************** Restore the chained fsp - done after an oplock break. ****************************************************************************/ + void file_chain_restore(void) { chain_fsp = oplock_save_chain_fsp; diff --git a/source/smbd/groupname.c b/source/smbd/groupname.c index d44e9a7a39c..d7566ff5354 100644 --- a/source/smbd/groupname.c +++ b/source/smbd/groupname.c @@ -22,7 +22,6 @@ #ifdef USING_GROUPNAME_MAP #include "includes.h" -extern int DEBUGLEVEL; extern DOM_SID global_sam_sid; diff --git a/source/smbd/ipc.c b/source/smbd/ipc.c index 3ec6d1f1cff..4bd83373147 100644 --- a/source/smbd/ipc.c +++ b/source/smbd/ipc.c @@ -28,7 +28,6 @@ #include "includes.h" -extern int DEBUGLEVEL; extern int max_send; extern fstring local_machine; diff --git a/source/smbd/lanman.c b/source/smbd/lanman.c index 3044d13ccd7..a1817425f61 100644 --- a/source/smbd/lanman.c +++ b/source/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/source/smbd/mangle.c b/source/smbd/mangle.c index d6d470c2dab..7ef4107df7b 100644 --- a/source/smbd/mangle.c +++ b/source/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. */ diff --git a/source/smbd/message.c b/source/smbd/message.c index b3da3f2b611..84161f1c24e 100644 --- a/source/smbd/message.c +++ b/source/smbd/message.c @@ -27,8 +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=0; diff --git a/source/smbd/negprot.c b/source/smbd/negprot.c index 25419caf625..50852ccaf9b 100644 --- a/source/smbd/negprot.c +++ b/source/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/source/smbd/notify_kernel.c b/source/smbd/notify_kernel.c index f1e40793c85..224581abec4 100644 --- a/source/smbd/notify_kernel.c +++ b/source/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/source/smbd/nttrans.c b/source/smbd/nttrans.c index e913daef18a..d7a1afdd145 100644 --- a/source/smbd/nttrans.c +++ b/source/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/source/smbd/open.c b/source/smbd/open.c index 6919249a226..ca4eca09deb 100644 --- a/source/smbd/open.c +++ b/source/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; @@ -184,7 +182,6 @@ static BOOL open_file(files_struct *fsp,connection_struct *conn, fsp->mode = psbuf->st_mode; fsp->inode = psbuf->st_ino; fsp->dev = psbuf->st_dev; - GetTimeOfDay(&fsp->open_time); fsp->vuid = current_user.vuid; fsp->size = psbuf->st_size; fsp->pos = -1; @@ -500,7 +497,7 @@ dev = %x, inode = %.0f\n", *p_oplock_request, share_entry->op_type, fname, (unsi /* Oplock break - unlock to request it. */ unlock_share_entry(conn, dev, inode); - opb_ret = request_oplock_break(share_entry, dev, inode); + opb_ret = request_oplock_break(share_entry); /* Now relock. */ lock_share_entry(conn, dev, inode); @@ -956,11 +953,9 @@ files_struct *open_file_stat(connection_struct *conn, char *fname, * Setup the files_struct for it. */ - fsp->fd = -1; fsp->mode = psbuf->st_mode; fsp->inode = psbuf->st_ino; fsp->dev = psbuf->st_dev; - GetTimeOfDay(&fsp->open_time); fsp->size = psbuf->st_size; fsp->vuid = current_user.vuid; fsp->pos = -1; @@ -1128,11 +1123,9 @@ files_struct *open_directory(connection_struct *conn, char *fname, * Setup the files_struct for it. */ - fsp->fd = -1; fsp->mode = psbuf->st_mode; fsp->inode = psbuf->st_ino; fsp->dev = psbuf->st_dev; - GetTimeOfDay(&fsp->open_time); fsp->size = psbuf->st_size; fsp->vuid = current_user.vuid; fsp->pos = -1; @@ -1256,7 +1249,7 @@ dev = %x, inode = %.0f\n", share_entry->op_type, fname, (unsigned int)dev, (doub /* Oplock break.... */ unlock_share_entry(conn, dev, inode); - if(request_oplock_break(share_entry, dev, inode) == False) + if(request_oplock_break(share_entry) == False) { DEBUG(0,("check_file_sharing: FAILED when breaking oplock (%x) on file %s, \ dev = %x, inode = %.0f\n", old_shares[i].op_type, fname, (unsigned int)dev, (double)inode)); diff --git a/source/smbd/oplock.c b/source/smbd/oplock.c index de4b3338f40..0fe2de94320 100644 --- a/source/smbd/oplock.c +++ b/source/smbd/oplock.c @@ -1,8 +1,9 @@ /* Unix SMB/Netbios implementation. - Version 1.9. + Version 2.2.x oplock processing Copyright (C) Andrew Tridgell 1992-1998 + Copyright (C) Jeremy Allison 1998 - 2001 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -21,8 +22,6 @@ #include "includes.h" -extern int DEBUGLEVEL; - /* Oplock ipc UDP socket. */ static int oplock_sock = -1; uint16 global_oplock_port = 0; @@ -37,7 +36,7 @@ extern int smb_read_error; static struct kernel_oplocks *koplocks; -static BOOL oplock_break(SMB_DEV_T dev, SMB_INO_T inode, struct timeval *tval, BOOL local); +static BOOL oplock_break(SMB_DEV_T dev, SMB_INO_T inode, unsigned long file_id, BOOL local); /**************************************************************************** Get the number of current exclusive oplocks. @@ -76,97 +75,97 @@ BOOL oplock_message_waiting(fd_set *fds) BOOL receive_local_message(fd_set *fds, char *buffer, int buffer_len, int timeout) { - struct sockaddr_in from; - int fromlen = sizeof(from); - int32 msg_len = 0; - - smb_read_error = 0; - - if(timeout != 0) { - struct timeval to; - int selrtn; - int maxfd = oplock_sock; - - if (koplocks && koplocks->notification_fd != -1) { - FD_SET(koplocks->notification_fd, fds); - maxfd = MAX(maxfd, koplocks->notification_fd); - } - - to.tv_sec = timeout / 1000; - to.tv_usec = (timeout % 1000) * 1000; - - selrtn = sys_select(maxfd+1,fds,&to); - - if (selrtn == -1 && errno == EINTR) { - /* could be a kernel oplock interrupt */ - if (koplocks && koplocks->msg_waiting(fds)) { - return koplocks->receive_message(fds, buffer, buffer_len); - } - } - - /* Check if error */ - if(selrtn == -1) { - /* something is wrong. Maybe the socket is dead? */ - smb_read_error = READ_ERROR; - return False; - } - - /* Did we timeout ? */ - if (selrtn == 0) { - smb_read_error = READ_TIMEOUT; - return False; - } - } - - if (koplocks && koplocks->msg_waiting(fds)) { - return koplocks->receive_message(fds, buffer, buffer_len); - } - - if (!FD_ISSET(oplock_sock, fds)) return False; - - /* - * From here down we deal with the smbd <--> smbd - * oplock break protocol only. - */ - - /* - * Read a loopback udp message. - */ - msg_len = recvfrom(oplock_sock, &buffer[OPBRK_CMD_HEADER_LEN], - buffer_len - OPBRK_CMD_HEADER_LEN, 0, - (struct sockaddr *)&from, &fromlen); - - if(msg_len < 0) { - DEBUG(0,("receive_local_message. Error in recvfrom. (%s).\n",strerror(errno))); - return False; - } - - /* Validate message length. */ - if(msg_len > (buffer_len - OPBRK_CMD_HEADER_LEN)) { - DEBUG(0,("receive_local_message: invalid msg_len (%d) max can be %d\n", - msg_len, - buffer_len - OPBRK_CMD_HEADER_LEN)); - return False; - } - - /* Validate message from address (must be localhost). */ - if(from.sin_addr.s_addr != htonl(INADDR_LOOPBACK)) { - DEBUG(0,("receive_local_message: invalid 'from' address \ -(was %lx should be 127.0.0.1\n", (long)from.sin_addr.s_addr)); - return False; - } - - /* Setup the message header */ - SIVAL(buffer,OPBRK_CMD_LEN_OFFSET,msg_len); - SSVAL(buffer,OPBRK_CMD_PORT_OFFSET,ntohs(from.sin_port)); - - return True; + struct sockaddr_in from; + int fromlen = sizeof(from); + int32 msg_len = 0; + + smb_read_error = 0; + + if(timeout != 0) { + struct timeval to; + int selrtn; + int maxfd = oplock_sock; + + if (koplocks && koplocks->notification_fd != -1) { + FD_SET(koplocks->notification_fd, fds); + maxfd = MAX(maxfd, koplocks->notification_fd); + } + + to.tv_sec = timeout / 1000; + to.tv_usec = (timeout % 1000) * 1000; + + selrtn = sys_select(maxfd+1,fds,&to); + + if (selrtn == -1 && errno == EINTR) { + /* could be a kernel oplock interrupt */ + if (koplocks && koplocks->msg_waiting(fds)) { + return koplocks->receive_message(fds, buffer, buffer_len); + } + } + + /* Check if error */ + if(selrtn == -1) { + /* something is wrong. Maybe the socket is dead? */ + smb_read_error = READ_ERROR; + return False; + } + + /* Did we timeout ? */ + if (selrtn == 0) { + smb_read_error = READ_TIMEOUT; + return False; + } + } + + if (koplocks && koplocks->msg_waiting(fds)) { + return koplocks->receive_message(fds, buffer, buffer_len); + } + + if (!FD_ISSET(oplock_sock, fds)) + return False; + + /* + * From here down we deal with the smbd <--> smbd + * oplock break protocol only. + */ + + /* + * Read a loopback udp message. + */ + msg_len = recvfrom(oplock_sock, &buffer[OPBRK_CMD_HEADER_LEN], + buffer_len - OPBRK_CMD_HEADER_LEN, 0, (struct sockaddr *)&from, &fromlen); + + if(msg_len < 0) { + DEBUG(0,("receive_local_message. Error in recvfrom. (%s).\n",strerror(errno))); + return False; + } + + /* Validate message length. */ + if(msg_len > (buffer_len - OPBRK_CMD_HEADER_LEN)) { + DEBUG(0,("receive_local_message: invalid msg_len (%d) max can be %d\n", msg_len, + buffer_len - OPBRK_CMD_HEADER_LEN)); + return False; + } + + /* Validate message from address (must be localhost). */ + if(from.sin_addr.s_addr != htonl(INADDR_LOOPBACK)) { + DEBUG(0,("receive_local_message: invalid 'from' address \ +(was %lx should be 127.0.0.1)\n", (long)from.sin_addr.s_addr)); + return False; + } + + /* Setup the message header */ + SIVAL(buffer,OPBRK_CMD_LEN_OFFSET,msg_len); + SSVAL(buffer,OPBRK_CMD_PORT_OFFSET,ntohs(from.sin_port)); + + return True; } /**************************************************************************** Attempt to set an oplock on a file. Always succeeds if kernel oplocks are disabled (just sets flags). Returns True if oplock set. ****************************************************************************/ + BOOL set_file_oplock(files_struct *fsp, int oplock_type) { if (koplocks && !koplocks->set_oplock(fsp, oplock_type)) @@ -179,8 +178,9 @@ BOOL set_file_oplock(files_struct *fsp, int oplock_type) else exclusive_oplocks_open++; - DEBUG(5,("set_file_oplock: granted oplock on file %s, dev = %x, inode = %.0f, tv_sec = %x, tv_usec = %x\n", - fsp->fsp_name, (unsigned int)fsp->dev, (double)fsp->inode, + DEBUG(5,("set_file_oplock: granted oplock on file %s, dev = %x, inode = %.0f, file_id = %lu, \ +tv_sec = %x, tv_usec = %x\n", + fsp->fsp_name, (unsigned int)fsp->dev, (double)fsp->inode, fsp->file_id, (int)fsp->open_time.tv_sec, (int)fsp->open_time.tv_usec )); return True; @@ -192,7 +192,8 @@ BOOL set_file_oplock(files_struct *fsp, int oplock_type) void release_file_oplock(files_struct *fsp) { - if (koplocks) koplocks->release_oplock(fsp); + if (koplocks) + koplocks->release_oplock(fsp); if (fsp->oplock_type == LEVEL_II_OPLOCK) level_II_oplocks_open--; @@ -211,7 +212,8 @@ void release_file_oplock(files_struct *fsp) static void downgrade_file_oplock(files_struct *fsp) { - if (koplocks) koplocks->release_oplock(fsp); + if (koplocks) + koplocks->release_oplock(fsp); fsp->oplock_type = LEVEL_II_OPLOCK; exclusive_oplocks_open--; level_II_oplocks_open++; @@ -293,161 +295,142 @@ int setup_oplock_select_set( fd_set *fds) Process an oplock break message - whether it came from the UDP socket or from the kernel. ****************************************************************************/ + BOOL process_local_message(char *buffer, int buf_size) { - int32 msg_len; - uint16 from_port; - char *msg_start; - SMB_DEV_T dev; - SMB_INO_T inode; - pid_t remotepid; - struct timeval tval; - struct timeval *ptval = NULL; - uint16 break_cmd_type; - - msg_len = IVAL(buffer,OPBRK_CMD_LEN_OFFSET); - from_port = SVAL(buffer,OPBRK_CMD_PORT_OFFSET); - - msg_start = &buffer[OPBRK_CMD_HEADER_LEN]; - - DEBUG(5,("process_local_message: Got a message of length %d from port (%d)\n", - msg_len, from_port)); - - /* - * Pull the info out of the requesting packet. - */ - - break_cmd_type = SVAL(msg_start,OPBRK_MESSAGE_CMD_OFFSET); - - switch(break_cmd_type) - { - case KERNEL_OPLOCK_BREAK_CMD: - if (!koplocks) { - DEBUG(0,("unexpected kernel oplock break!\n")); - break; - } - if (!koplocks->parse_message(msg_start, msg_len, &inode, &dev)) { - DEBUG(0,("kernel oplock break parse failure!\n")); - } - break; - - case OPLOCK_BREAK_CMD: - case LEVEL_II_OPLOCK_BREAK_CMD: - - /* Ensure that the msg length is correct. */ - if(msg_len != OPLOCK_BREAK_MSG_LEN) - { - DEBUG(0,("process_local_message: incorrect length for OPLOCK_BREAK_CMD (was %d, should be %d).\n", - (int)msg_len, (int)OPLOCK_BREAK_MSG_LEN)); - return False; - } - { - long usec; - time_t sec; - - memcpy((char *)&inode, msg_start+OPLOCK_BREAK_INODE_OFFSET,sizeof(inode)); - memcpy((char *)&dev, msg_start+OPLOCK_BREAK_DEV_OFFSET,sizeof(dev)); - memcpy((char *)&sec, msg_start+OPLOCK_BREAK_SEC_OFFSET,sizeof(sec)); - tval.tv_sec = sec; - memcpy((char *)&usec, msg_start+OPLOCK_BREAK_USEC_OFFSET, sizeof(usec)); - tval.tv_usec = usec; - - ptval = &tval; - - memcpy((char *)&remotepid, msg_start+OPLOCK_BREAK_PID_OFFSET,sizeof(remotepid)); - - DEBUG(5,("process_local_message: (%s) oplock break request from \ -pid %d, port %d, dev = %x, inode = %.0f\n", - (break_cmd_type == OPLOCK_BREAK_CMD) ? "exclusive" : "level II", - (int)remotepid, from_port, (unsigned int)dev, (double)inode)); - } - break; - - /* - * Keep this as a debug case - eventually we can remove it. - */ - case 0x8001: - DEBUG(0,("process_local_message: Received unsolicited break \ + int32 msg_len; + uint16 from_port; + char *msg_start; + pid_t remotepid; + SMB_DEV_T dev; + SMB_INO_T inode; + unsigned long file_id; + uint16 break_cmd_type; + + msg_len = IVAL(buffer,OPBRK_CMD_LEN_OFFSET); + from_port = SVAL(buffer,OPBRK_CMD_PORT_OFFSET); + + msg_start = &buffer[OPBRK_CMD_HEADER_LEN]; + + DEBUG(5,("process_local_message: Got a message of length %d from port (%d)\n", + msg_len, from_port)); + + /* + * Pull the info out of the requesting packet. + */ + + break_cmd_type = SVAL(msg_start,OPBRK_MESSAGE_CMD_OFFSET); + + switch(break_cmd_type) { + case KERNEL_OPLOCK_BREAK_CMD: + if (!koplocks) { + DEBUG(0,("unexpected kernel oplock break!\n")); + break; + } + if (!koplocks->parse_message(msg_start, msg_len, &inode, &dev, &file_id)) { + DEBUG(0,("kernel oplock break parse failure!\n")); + } + break; + + case OPLOCK_BREAK_CMD: + case LEVEL_II_OPLOCK_BREAK_CMD: + + /* Ensure that the msg length is correct. */ + if(msg_len != OPLOCK_BREAK_MSG_LEN) { + DEBUG(0,("process_local_message: incorrect length for OPLOCK_BREAK_CMD (was %d, should be %d).\n", + (int)msg_len, (int)OPLOCK_BREAK_MSG_LEN)); + return False; + } + + memcpy((char *)&remotepid, msg_start+OPLOCK_BREAK_PID_OFFSET,sizeof(remotepid)); + memcpy((char *)&inode, msg_start+OPLOCK_BREAK_INODE_OFFSET,sizeof(inode)); + memcpy((char *)&dev, msg_start+OPLOCK_BREAK_DEV_OFFSET,sizeof(dev)); + memcpy((char *)&file_id, msg_start+OPLOCK_BREAK_FILEID_OFFSET,sizeof(file_id)); + + DEBUG(5,("process_local_message: (%s) oplock break request from \ +pid %d, port %d, dev = %x, inode = %.0f, file_id = %lu\n", + (break_cmd_type == OPLOCK_BREAK_CMD) ? "exclusive" : "level II", + (int)remotepid, from_port, (unsigned int)dev, (double)inode, file_id)); + break; + + /* + * Keep this as a debug case - eventually we can remove it. + */ + case 0x8001: + DEBUG(0,("process_local_message: Received unsolicited break \ reply - dumping info.\n")); - if(msg_len != OPLOCK_BREAK_MSG_LEN) - { - DEBUG(0,("process_local_message: ubr: incorrect length for reply \ + if(msg_len != OPLOCK_BREAK_MSG_LEN) { + DEBUG(0,("process_local_message: ubr: incorrect length for reply \ (was %d, should be %d).\n", (int)msg_len, (int)OPLOCK_BREAK_MSG_LEN)); - return False; - } - - { - memcpy((char *)&inode, msg_start+OPLOCK_BREAK_INODE_OFFSET,sizeof(inode)); - memcpy((char *)&remotepid, msg_start+OPLOCK_BREAK_PID_OFFSET,sizeof(remotepid)); - memcpy((char *)&dev, msg_start+OPLOCK_BREAK_DEV_OFFSET,sizeof(dev)); - - DEBUG(0,("process_local_message: unsolicited oplock break reply from \ -pid %d, port %d, dev = %x, inode = %.0f\n", (int)remotepid, from_port, (unsigned int)dev, (double)inode)); - - } - return False; - - default: - DEBUG(0,("process_local_message: unknown UDP message command code (%x) - ignoring.\n", - (unsigned int)SVAL(msg_start,0))); - return False; - } - - /* - * Now actually process the break request. - */ - - if((exclusive_oplocks_open + level_II_oplocks_open) != 0) - { - if (oplock_break(dev, inode, ptval, False) == False) - { - DEBUG(0,("process_local_message: oplock break failed.\n")); - return False; - } - } - else - { - /* - * If we have no record of any currently open oplocks, - * it's not an error, as a close command may have - * just been issued on the file that was oplocked. - * Just log a message and return success in this case. - */ - DEBUG(3,("process_local_message: oplock break requested with no outstanding \ + return False; + } + + memcpy((char *)&inode, msg_start+OPLOCK_BREAK_INODE_OFFSET,sizeof(inode)); + memcpy((char *)&remotepid, msg_start+OPLOCK_BREAK_PID_OFFSET,sizeof(remotepid)); + memcpy((char *)&dev, msg_start+OPLOCK_BREAK_DEV_OFFSET,sizeof(dev)); + memcpy((char *)&file_id, msg_start+OPLOCK_BREAK_FILEID_OFFSET,sizeof(file_id)); + + DEBUG(0,("process_local_message: unsolicited oplock break reply from \ +pid %d, port %d, dev = %x, inode = %.0f, file_id = %lu\n", + (int)remotepid, from_port, (unsigned int)dev, (double)inode, file_id)); + + return False; + + default: + DEBUG(0,("process_local_message: unknown UDP message command code (%x) - ignoring.\n", + (unsigned int)SVAL(msg_start,0))); + return False; + } + + /* + * Now actually process the break request. + */ + + if((exclusive_oplocks_open + level_II_oplocks_open) != 0) { + if (oplock_break(dev, inode, file_id, False) == False) { + DEBUG(0,("process_local_message: oplock break failed.\n")); + return False; + } + } else { + /* + * If we have no record of any currently open oplocks, + * it's not an error, as a close command may have + * just been issued on the file that was oplocked. + * Just log a message and return success in this case. + */ + DEBUG(3,("process_local_message: oplock break requested with no outstanding \ oplocks. Returning success.\n")); - } - - /* - * Do the appropriate reply - none in the kernel or level II case. - */ - - if(SVAL(msg_start,OPBRK_MESSAGE_CMD_OFFSET) == OPLOCK_BREAK_CMD) - { - struct sockaddr_in toaddr; - - /* Send the message back after OR'ing in the 'REPLY' bit. */ - SSVAL(msg_start,OPBRK_MESSAGE_CMD_OFFSET,OPLOCK_BREAK_CMD | CMD_REPLY); - - memset((char *)&toaddr,'\0',sizeof(toaddr)); - toaddr.sin_addr.s_addr = htonl(INADDR_LOOPBACK); - toaddr.sin_port = htons(from_port); - toaddr.sin_family = AF_INET; - - if(sendto( oplock_sock, msg_start, OPLOCK_BREAK_MSG_LEN, 0, - (struct sockaddr *)&toaddr, sizeof(toaddr)) < 0) - { - DEBUG(0,("process_local_message: sendto process %d failed. Errno was %s\n", - (int)remotepid, strerror(errno))); - return False; - } - - DEBUG(5,("process_local_message: oplock break reply sent to \ -pid %d, port %d, for file dev = %x, inode = %.0f\n", - (int)remotepid, from_port, (unsigned int)dev, (double)inode)); - } - - return True; + } + + /* + * Do the appropriate reply - none in the kernel or level II case. + */ + + if(SVAL(msg_start,OPBRK_MESSAGE_CMD_OFFSET) == OPLOCK_BREAK_CMD) { + struct sockaddr_in toaddr; + + /* Send the message back after OR'ing in the 'REPLY' bit. */ + SSVAL(msg_start,OPBRK_MESSAGE_CMD_OFFSET,OPLOCK_BREAK_CMD | CMD_REPLY); + + memset((char *)&toaddr,'\0',sizeof(toaddr)); + toaddr.sin_addr.s_addr = htonl(INADDR_LOOPBACK); + toaddr.sin_port = htons(from_port); + toaddr.sin_family = AF_INET; + + if(sendto( oplock_sock, msg_start, OPLOCK_BREAK_MSG_LEN, 0, + (struct sockaddr *)&toaddr, sizeof(toaddr)) < 0) { + DEBUG(0,("process_local_message: sendto process %d failed. Errno was %s\n", + (int)remotepid, strerror(errno))); + return False; + } + + DEBUG(5,("process_local_message: oplock break reply sent to \ +pid %d, port %d, for file dev = %x, inode = %.0f, file_id = %lu\n", + (int)remotepid, from_port, (unsigned int)dev, (double)inode, file_id)); + } + + return True; } /**************************************************************************** @@ -476,81 +459,82 @@ static void prepare_break_message(char *outbuf, files_struct *fsp, BOOL level2) static void wait_before_sending_break(BOOL local_request) { - extern struct timeval smb_last_time; + extern struct timeval smb_last_time; - if(local_request) { - struct timeval cur_tv; - long wait_left = (long)lp_oplock_break_wait_time(); + if(local_request) { + struct timeval cur_tv; + long wait_left = (long)lp_oplock_break_wait_time(); - if (wait_left == 0) - return; + if (wait_left == 0) + return; - GetTimeOfDay(&cur_tv); + GetTimeOfDay(&cur_tv); - wait_left -= ((cur_tv.tv_sec - smb_last_time.tv_sec)*1000) + + wait_left -= ((cur_tv.tv_sec - smb_last_time.tv_sec)*1000) + ((cur_tv.tv_usec - smb_last_time.tv_usec)/1000); - if(wait_left > 0) { - wait_left = MIN(wait_left, 1000); - sys_usleep(wait_left * 1000); - } - } + if(wait_left > 0) { + wait_left = MIN(wait_left, 1000); + sys_usleep(wait_left * 1000); + } + } } /**************************************************************************** Ensure that we have a valid oplock. ****************************************************************************/ -static files_struct *initial_break_processing(SMB_DEV_T dev, SMB_INO_T inode, struct timeval *tval) + +static files_struct *initial_break_processing(SMB_DEV_T dev, SMB_INO_T inode, unsigned long file_id) { - files_struct *fsp = NULL; - - if( DEBUGLVL( 3 ) ) - { - dbgtext( "initial_break_processing: called for dev = %x, inode = %.0f tv_sec = %x, tv_usec = %x.\n", - (unsigned int)dev, (double)inode, tval ? (int)tval->tv_sec : 0, - tval ? (int)tval->tv_usec : 0); - dbgtext( "Current oplocks_open (exclusive = %d, levelII = %d)\n", - exclusive_oplocks_open, level_II_oplocks_open ); - } - - /* We need to search the file open table for the - entry containing this dev and inode, and ensure - we have an oplock on it. */ - fsp = file_find_dit(dev, inode, tval); - - if(fsp == NULL) - { - /* The file could have been closed in the meantime - return success. */ - if( DEBUGLVL( 3 ) ) - { - dbgtext( "initial_break_processing: cannot find open file with " ); - dbgtext( "dev = %x, inode = %.0f ", (unsigned int)dev, (double)inode); - dbgtext( "allowing break to succeed.\n" ); - } - return NULL; - } - - /* Ensure we have an oplock on the file */ - - /* There is a potential race condition in that an oplock could - have been broken due to another udp request, and yet there are - still oplock break messages being sent in the udp message - queue for this file. So return true if we don't have an oplock, - as we may have just freed it. - */ - - if(fsp->oplock_type == NO_OPLOCK) - { - if( DEBUGLVL( 3 ) ) - { - dbgtext( "initial_break_processing: file %s ", fsp->fsp_name ); - dbgtext( "(dev = %x, inode = %.0f) has no oplock.\n", (unsigned int)dev, (double)inode ); - dbgtext( "Allowing break to succeed regardless.\n" ); - } - return NULL; - } - - return fsp; + files_struct *fsp = NULL; + + if( DEBUGLVL( 3 ) ) { + dbgtext( "initial_break_processing: called for dev = %x, inode = %.0f file_id = %lu\n", + (unsigned int)dev, (double)inode, file_id); + dbgtext( "Current oplocks_open (exclusive = %d, levelII = %d)\n", + exclusive_oplocks_open, level_II_oplocks_open ); + } + + /* + * We need to search the file open table for the + * entry containing this dev and inode, and ensure + * we have an oplock on it. + */ + + fsp = file_find_dif(dev, inode, file_id); + + if(fsp == NULL) { + /* The file could have been closed in the meantime - return success. */ + if( DEBUGLVL( 3 ) ) { + dbgtext( "initial_break_processing: cannot find open file with " ); + dbgtext( "dev = %x, inode = %.0f file_id = %lu", (unsigned int)dev, + (double)inode, file_id); + dbgtext( "allowing break to succeed.\n" ); + } + return NULL; + } + + /* Ensure we have an oplock on the file */ + + /* + * There is a potential race condition in that an oplock could + * have been broken due to another udp request, and yet there are + * still oplock break messages being sent in the udp message + * queue for this file. So return true if we don't have an oplock, + * as we may have just freed it. + */ + + if(fsp->oplock_type == NO_OPLOCK) { + if( DEBUGLVL( 3 ) ) { + dbgtext( "initial_break_processing: file %s ", fsp->fsp_name ); + dbgtext( "(dev = %x, inode = %.0f, file_id = %lu) has no oplock.\n", + (unsigned int)dev, (double)inode, fsp->file_id ); + dbgtext( "Allowing break to succeed regardless.\n" ); + } + return NULL; + } + + return fsp; } /**************************************************************************** @@ -559,336 +543,322 @@ static files_struct *initial_break_processing(SMB_DEV_T dev, SMB_INO_T inode, st BOOL oplock_break_level2(files_struct *fsp, BOOL local_request, int token) { - extern uint32 global_client_caps; - char outbuf[128]; - BOOL got_lock = False; - SMB_DEV_T dev = fsp->dev; - SMB_INO_T inode = fsp->inode; - - /* - * We can have a level II oplock even if the client is not - * level II oplock aware. In this case just remove the - * flags and don't send the break-to-none message to - * the client. - */ - - if (global_client_caps & CAP_LEVEL_II_OPLOCKS) { - /* - * If we are sending an oplock break due to an SMB sent - * by our own client we ensure that we wait at leat - * lp_oplock_break_wait_time() milliseconds before sending - * the packet. Sending the packet sooner can break Win9x - * and has reported to cause problems on NT. JRA. - */ - - wait_before_sending_break(local_request); - - /* Prepare the SMBlockingX message. */ - - prepare_break_message( outbuf, fsp, False); - if (!send_smb(smbd_server_fd(), outbuf)) - exit_server("oplock_break_level2: send_smb failed.\n"); - } - - /* - * Now we must update the shared memory structure to tell - * everyone else we no longer have a level II oplock on - * this open file. If local_request is true then token is - * the existing lock on the shared memory area. - */ - - if(!local_request && lock_share_entry_fsp(fsp) == False) { - DEBUG(0,("oplock_break_level2: unable to lock share entry for file %s\n", fsp->fsp_name )); - } else { - got_lock = True; - } - - if(remove_share_oplock(fsp)==False) { - DEBUG(0,("oplock_break_level2: unable to remove level II oplock for file %s\n", fsp->fsp_name )); - } - - if (!local_request && got_lock) - unlock_share_entry_fsp(fsp); - - fsp->oplock_type = NO_OPLOCK; - level_II_oplocks_open--; - - if(level_II_oplocks_open < 0) - { - DEBUG(0,("oplock_break_level2: level_II_oplocks_open < 0 (%d). PANIC ERROR\n", - level_II_oplocks_open)); - abort(); - } - - if( DEBUGLVL( 3 ) ) - { - dbgtext( "oplock_break_level2: returning success for " ); - dbgtext( "dev = %x, inode = %.0f\n", (unsigned int)dev, (double)inode ); - dbgtext( "Current level II oplocks_open = %d\n", level_II_oplocks_open ); - } - - return True; + extern uint32 global_client_caps; + char outbuf[128]; + BOOL got_lock = False; + SMB_DEV_T dev = fsp->dev; + SMB_INO_T inode = fsp->inode; + + /* + * We can have a level II oplock even if the client is not + * level II oplock aware. In this case just remove the + * flags and don't send the break-to-none message to + * the client. + */ + + if (global_client_caps & CAP_LEVEL_II_OPLOCKS) { + /* + * If we are sending an oplock break due to an SMB sent + * by our own client we ensure that we wait at leat + * lp_oplock_break_wait_time() milliseconds before sending + * the packet. Sending the packet sooner can break Win9x + * and has reported to cause problems on NT. JRA. + */ + + wait_before_sending_break(local_request); + + /* Prepare the SMBlockingX message. */ + + prepare_break_message( outbuf, fsp, False); + if (!send_smb(smbd_server_fd(), outbuf)) + exit_server("oplock_break_level2: send_smb failed.\n"); + } + + /* + * Now we must update the shared memory structure to tell + * everyone else we no longer have a level II oplock on + * this open file. If local_request is true then token is + * the existing lock on the shared memory area. + */ + + if(!local_request && lock_share_entry_fsp(fsp) == False) { + DEBUG(0,("oplock_break_level2: unable to lock share entry for file %s\n", fsp->fsp_name )); + } else { + got_lock = True; + } + + if(remove_share_oplock(fsp)==False) { + DEBUG(0,("oplock_break_level2: unable to remove level II oplock for file %s\n", fsp->fsp_name )); + } + + if (!local_request && got_lock) + unlock_share_entry_fsp(fsp); + + fsp->oplock_type = NO_OPLOCK; + level_II_oplocks_open--; + + if(level_II_oplocks_open < 0) { + DEBUG(0,("oplock_break_level2: level_II_oplocks_open < 0 (%d). PANIC ERROR\n", + level_II_oplocks_open)); + abort(); + } + + if( DEBUGLVL( 3 ) ) { + dbgtext( "oplock_break_level2: returning success for " ); + dbgtext( "dev = %x, inode = %.0f, file_id = %lu\n", (unsigned int)dev, (double)inode, fsp->file_id ); + dbgtext( "Current level II oplocks_open = %d\n", level_II_oplocks_open ); + } + + return True; } /**************************************************************************** Process an oplock break directly. ****************************************************************************/ -static BOOL oplock_break(SMB_DEV_T dev, SMB_INO_T inode, struct timeval *tval, BOOL local_request) +static BOOL oplock_break(SMB_DEV_T dev, SMB_INO_T inode, unsigned long file_id, BOOL local_request) { - extern uint32 global_client_caps; - extern struct current_user current_user; - char *inbuf = NULL; - char *outbuf = NULL; - files_struct *fsp = NULL; - time_t start_time; - BOOL shutdown_server = False; - BOOL oplock_timeout = False; - connection_struct *saved_user_conn; - connection_struct *saved_fsp_conn; - int saved_vuid; - pstring saved_dir; - int timeout = (OPLOCK_BREAK_TIMEOUT * 1000); - pstring file_name; - BOOL using_levelII; - - if((fsp = initial_break_processing(dev, inode, tval)) == NULL) - return True; - - /* - * Deal with a level II oplock going break to none separately. - */ - - if (LEVEL_II_OPLOCK_TYPE(fsp->oplock_type)) - return oplock_break_level2(fsp, local_request, -1); - - /* Mark the oplock break as sent - we don't want to send twice! */ - if (fsp->sent_oplock_break) - { - if( DEBUGLVL( 0 ) ) - { - dbgtext( "oplock_break: ERROR: oplock_break already sent for " ); - dbgtext( "file %s ", fsp->fsp_name); - dbgtext( "(dev = %x, inode = %.0f)\n", (unsigned int)dev, (double)inode ); - } - - /* We have to fail the open here as we cannot send another oplock break on - this file whilst we are awaiting a response from the client - neither - can we allow another open to succeed while we are waiting for the - client. - */ - return False; - } - - if(global_oplock_break) { - DEBUG(0,("ABORT : ABORT : recursion in oplock_break !!!!!\n")); - abort(); - } - - /* Now comes the horrid part. We must send an oplock break to the client, - and then process incoming messages until we get a close or oplock release. - At this point we know we need a new inbuf/outbuf buffer pair. - We cannot use these staticaly as we may recurse into here due to - messages crossing on the wire. - */ - - if((inbuf = (char *)malloc(BUFFER_SIZE + LARGE_WRITEX_HDR_SIZE + SAFETY_MARGIN))==NULL) - { - DEBUG(0,("oplock_break: malloc fail for input buffer.\n")); - return False; - } - - if((outbuf = (char *)malloc(BUFFER_SIZE + LARGE_WRITEX_HDR_SIZE + SAFETY_MARGIN))==NULL) - { - DEBUG(0,("oplock_break: malloc fail for output buffer.\n")); - free(inbuf); - inbuf = NULL; - return False; - } - - /* - * If we are sending an oplock break due to an SMB sent - * by our own client we ensure that we wait at leat - * lp_oplock_break_wait_time() milliseconds before sending - * the packet. Sending the packet sooner can break Win9x - * and has reported to cause problems on NT. JRA. - */ - - wait_before_sending_break(local_request); - - /* Prepare the SMBlockingX message. */ - - if ((global_client_caps & CAP_LEVEL_II_OPLOCKS) && - !koplocks && /* NOTE: we force levelII off for kernel oplocks - - this will change when it is supported */ - lp_level2_oplocks(SNUM(fsp->conn))) { - using_levelII = True; - } else { - using_levelII = False; - } - - prepare_break_message( outbuf, fsp, using_levelII); - /* Remember if we just sent a break to level II on this file. */ - fsp->sent_oplock_break = using_levelII? - LEVEL_II_BREAK_SENT:EXCLUSIVE_BREAK_SENT; - - if (!send_smb(smbd_server_fd(), outbuf)) - exit_server("oplock_break: send_smb failed.\n"); - - /* We need this in case a readraw crosses on the wire. */ - global_oplock_break = True; + extern uint32 global_client_caps; + extern struct current_user current_user; + char *inbuf = NULL; + char *outbuf = NULL; + files_struct *fsp = NULL; + time_t start_time; + BOOL shutdown_server = False; + BOOL oplock_timeout = False; + connection_struct *saved_user_conn; + connection_struct *saved_fsp_conn; + int saved_vuid; + pstring saved_dir; + int timeout = (OPLOCK_BREAK_TIMEOUT * 1000); + pstring file_name; + BOOL using_levelII; + + if((fsp = initial_break_processing(dev, inode, file_id)) == NULL) + return True; + + /* + * Deal with a level II oplock going break to none separately. + */ + + if (LEVEL_II_OPLOCK_TYPE(fsp->oplock_type)) + return oplock_break_level2(fsp, local_request, -1); + + /* Mark the oplock break as sent - we don't want to send twice! */ + if (fsp->sent_oplock_break) { + if( DEBUGLVL( 0 ) ) { + dbgtext( "oplock_break: ERROR: oplock_break already sent for " ); + dbgtext( "file %s ", fsp->fsp_name); + dbgtext( "(dev = %x, inode = %.0f, file_id = %lu)\n", (unsigned int)dev, (double)inode, fsp->file_id ); + } + + /* + * We have to fail the open here as we cannot send another oplock break on + * this file whilst we are awaiting a response from the client - neither + * can we allow another open to succeed while we are waiting for the client. + */ + return False; + } + + if(global_oplock_break) { + DEBUG(0,("ABORT : ABORT : recursion in oplock_break !!!!!\n")); + abort(); + } + + /* + * Now comes the horrid part. We must send an oplock break to the client, + * and then process incoming messages until we get a close or oplock release. + * At this point we know we need a new inbuf/outbuf buffer pair. + * We cannot use these staticaly as we may recurse into here due to + * messages crossing on the wire. + */ + + if((inbuf = (char *)malloc(BUFFER_SIZE + LARGE_WRITEX_HDR_SIZE + SAFETY_MARGIN))==NULL) { + DEBUG(0,("oplock_break: malloc fail for input buffer.\n")); + return False; + } + + if((outbuf = (char *)malloc(BUFFER_SIZE + LARGE_WRITEX_HDR_SIZE + SAFETY_MARGIN))==NULL) { + DEBUG(0,("oplock_break: malloc fail for output buffer.\n")); + SAFE_FREE(inbuf); + return False; + } + + /* + * If we are sending an oplock break due to an SMB sent + * by our own client we ensure that we wait at leat + * lp_oplock_break_wait_time() milliseconds before sending + * the packet. Sending the packet sooner can break Win9x + * and has reported to cause problems on NT. JRA. + */ + + wait_before_sending_break(local_request); + + /* Prepare the SMBlockingX message. */ + + if ((global_client_caps & CAP_LEVEL_II_OPLOCKS) && + !koplocks && /* NOTE: we force levelII off for kernel oplocks - this will change when it is supported */ + lp_level2_oplocks(SNUM(fsp->conn))) { + using_levelII = True; + } else { + using_levelII = False; + } + + prepare_break_message( outbuf, fsp, using_levelII); + /* Remember if we just sent a break to level II on this file. */ + fsp->sent_oplock_break = using_levelII? LEVEL_II_BREAK_SENT:EXCLUSIVE_BREAK_SENT; + + if (!send_smb(smbd_server_fd(), outbuf)) + exit_server("oplock_break: send_smb failed.\n"); + + /* We need this in case a readraw crosses on the wire. */ + global_oplock_break = True; - /* Process incoming messages. */ - - /* JRA - If we don't get a break from the client in OPLOCK_BREAK_TIMEOUT - seconds we should just die.... */ - - start_time = time(NULL); - - /* - * Save the information we need to re-become the - * user, then unbecome the user whilst we're doing this. - */ - saved_user_conn = current_user.conn; - saved_vuid = current_user.vuid; - saved_fsp_conn = fsp->conn; - vfs_GetWd(saved_fsp_conn,saved_dir); - change_to_root_user(); - /* Save the chain fnum. */ - file_chain_save(); - - /* - * From Charles Hoch <hoch@exemplary.com>. If the break processing - * code closes the file (as it often does), then the fsp pointer here - * points to free()'d memory. We *must* revalidate fsp each time - * around the loop. - */ - - pstrcpy(file_name, fsp->fsp_name); - - while((fsp = initial_break_processing(dev, inode, tval)) && - OPEN_FSP(fsp) && EXCLUSIVE_OPLOCK_TYPE(fsp->oplock_type)) - { - if(receive_smb(smbd_server_fd(),inbuf, timeout) == False) - { - /* - * Die if we got an error. - */ - - if (smb_read_error == READ_EOF) { - DEBUG( 0, ( "oplock_break: end of file from client\n" ) ); - shutdown_server = True; - } else if (smb_read_error == READ_ERROR) { - DEBUG( 0, ("oplock_break: receive_smb error (%s)\n", strerror(errno)) ); - shutdown_server = True; - } else if (smb_read_error == READ_TIMEOUT) { - DEBUG( 0, ( "oplock_break: receive_smb timed out after %d seconds.\n", - OPLOCK_BREAK_TIMEOUT ) ); - oplock_timeout = True; - } - - DEBUGADD( 0, ( "oplock_break failed for file %s ", file_name ) ); - DEBUGADD( 0, ( "(dev = %x, inode = %.0f).\n", (unsigned int)dev, (double)inode)); - - break; - } - - /* - * There are certain SMB requests that we shouldn't allow - * to recurse. opens, renames and deletes are the obvious - * ones. This is handled in the switch_message() function. - * If global_oplock_break is set they will push the packet onto - * the pending smb queue and return -1 (no reply). - * JRA. - */ - - process_smb(inbuf, outbuf); - - /* - * Die if we go over the time limit. - */ - - if((time(NULL) - start_time) > OPLOCK_BREAK_TIMEOUT) - { - if( DEBUGLVL( 0 ) ) - { - dbgtext( "oplock_break: no break received from client " ); - dbgtext( "within %d seconds.\n", OPLOCK_BREAK_TIMEOUT ); - dbgtext( "oplock_break failed for file %s ", fsp->fsp_name ); - dbgtext( "(dev = %x, inode = %.0f).\n", (unsigned int)dev, (double)inode ); - } - oplock_timeout = True; - break; - } - } - - /* - * Go back to being the user who requested the oplock - * break. - */ - if((saved_user_conn != NULL) && (saved_vuid != UID_FIELD_INVALID) && !change_to_user(saved_user_conn, saved_vuid)) - { - DEBUG( 0, ( "oplock_break: unable to re-become user!" ) ); - DEBUGADD( 0, ( "Shutting down server\n" ) ); - close(oplock_sock); - exit_server("unable to re-become user"); - } - /* Including the directory. */ - vfs_ChDir(saved_fsp_conn,saved_dir); - - /* Restore the chain fnum. */ - file_chain_restore(); - - /* Free the buffers we've been using to recurse. */ - free(inbuf); - free(outbuf); - - /* We need this in case a readraw crossed on the wire. */ - if(global_oplock_break) - global_oplock_break = False; - - /* - * If the client timed out then clear the oplock (or go to level II) - * and continue. This seems to be what NT does and is better than dropping - * the connection. - */ - - if(oplock_timeout && (fsp = initial_break_processing(dev, inode, tval)) && - OPEN_FSP(fsp) && EXCLUSIVE_OPLOCK_TYPE(fsp->oplock_type)) - { - DEBUG(0,("oplock_break: client failure in oplock break in file %s\n", fsp->fsp_name)); - remove_oplock(fsp,True); - global_client_failed_oplock_break = True; /* Never grant this client an oplock again. */ - } - - /* - * If the client had an error we must die. - */ - - if(shutdown_server) - { - DEBUG( 0, ( "oplock_break: client failure in break - " ) ); - DEBUGADD( 0, ( "shutting down this smbd.\n" ) ); - close(oplock_sock); - exit_server("oplock break failure"); - } - - /* Santity check - remove this later. JRA */ - if(exclusive_oplocks_open < 0) - { - DEBUG(0,("oplock_break: exclusive_oplocks_open < 0 (%d). PANIC ERROR\n", - exclusive_oplocks_open)); - abort(); - } - - if( DEBUGLVL( 3 ) ) - { - dbgtext( "oplock_break: returning success for " ); - dbgtext( "dev = %x, inode = %.0f\n", (unsigned int)dev, (double)inode ); - dbgtext( "Current exclusive_oplocks_open = %d\n", exclusive_oplocks_open ); - } - - return True; + /* Process incoming messages. */ + + /* + * JRA - If we don't get a break from the client in OPLOCK_BREAK_TIMEOUT + * seconds we should just die.... + */ + + start_time = time(NULL); + + /* + * Save the information we need to re-become the + * user, then unbecome the user whilst we're doing this. + */ + saved_user_conn = current_user.conn; + saved_vuid = current_user.vuid; + saved_fsp_conn = fsp->conn; + vfs_GetWd(saved_fsp_conn,saved_dir); + change_to_root_user(); + /* Save the chain fnum. */ + file_chain_save(); + + /* + * From Charles Hoch <hoch@exemplary.com>. If the break processing + * code closes the file (as it often does), then the fsp pointer here + * points to free()'d memory. We *must* revalidate fsp each time + * around the loop. + */ + + pstrcpy(file_name, fsp->fsp_name); + + while((fsp = initial_break_processing(dev, inode, file_id)) && + OPEN_FSP(fsp) && EXCLUSIVE_OPLOCK_TYPE(fsp->oplock_type)) { + if(receive_smb(smbd_server_fd(),inbuf, timeout) == False) { + /* + * Die if we got an error. + */ + + if (smb_read_error == READ_EOF) { + DEBUG( 0, ( "oplock_break: end of file from client\n" ) ); + shutdown_server = True; + } else if (smb_read_error == READ_ERROR) { + DEBUG( 0, ("oplock_break: receive_smb error (%s)\n", strerror(errno)) ); + shutdown_server = True; + } else if (smb_read_error == READ_TIMEOUT) { + DEBUG( 0, ( "oplock_break: receive_smb timed out after %d seconds.\n", OPLOCK_BREAK_TIMEOUT ) ); + oplock_timeout = True; + } + + DEBUGADD( 0, ( "oplock_break failed for file %s ", file_name ) ); + DEBUGADD( 0, ( "(dev = %x, inode = %.0f, file_id = %lu).\n", + (unsigned int)dev, (double)inode, file_id)); + + break; + } + + /* + * There are certain SMB requests that we shouldn't allow + * to recurse. opens, renames and deletes are the obvious + * ones. This is handled in the switch_message() function. + * If global_oplock_break is set they will push the packet onto + * the pending smb queue and return -1 (no reply). + * JRA. + */ + + process_smb(inbuf, outbuf); + + /* + * Die if we go over the time limit. + */ + + if((time(NULL) - start_time) > OPLOCK_BREAK_TIMEOUT) { + if( DEBUGLVL( 0 ) ) { + dbgtext( "oplock_break: no break received from client " ); + dbgtext( "within %d seconds.\n", OPLOCK_BREAK_TIMEOUT ); + dbgtext( "oplock_break failed for file %s ", fsp->fsp_name ); + dbgtext( "(dev = %x, inode = %.0f, file_id = %lu).\n", + (unsigned int)dev, (double)inode, file_id ); + } + oplock_timeout = True; + break; + } + } + + /* + * Go back to being the user who requested the oplock + * break. + */ + if((saved_user_conn != NULL) && (saved_vuid != UID_FIELD_INVALID) && !change_to_user(saved_user_conn, saved_vuid)) { + DEBUG( 0, ( "oplock_break: unable to re-become user!" ) ); + DEBUGADD( 0, ( "Shutting down server\n" ) ); + close(oplock_sock); + exit_server("unable to re-become user"); + } + + /* Including the directory. */ + vfs_ChDir(saved_fsp_conn,saved_dir); + + /* Restore the chain fnum. */ + file_chain_restore(); + + /* Free the buffers we've been using to recurse. */ + SAFE_FREE(inbuf); + SAFE_FREE(outbuf); + + /* We need this in case a readraw crossed on the wire. */ + if(global_oplock_break) + global_oplock_break = False; + + /* + * If the client timed out then clear the oplock (or go to level II) + * and continue. This seems to be what NT does and is better than dropping + * the connection. + */ + + if(oplock_timeout && (fsp = initial_break_processing(dev, inode, file_id)) && + OPEN_FSP(fsp) && EXCLUSIVE_OPLOCK_TYPE(fsp->oplock_type)) { + DEBUG(0,("oplock_break: client failure in oplock break in file %s\n", fsp->fsp_name)); + remove_oplock(fsp,True); + global_client_failed_oplock_break = True; /* Never grant this client an oplock again. */ + } + + /* + * If the client had an error we must die. + */ + + if(shutdown_server) { + DEBUG( 0, ( "oplock_break: client failure in break - " ) ); + DEBUGADD( 0, ( "shutting down this smbd.\n" ) ); + close(oplock_sock); + exit_server("oplock break failure"); + } + + /* Santity check - remove this later. JRA */ + if(exclusive_oplocks_open < 0) { + DEBUG(0,("oplock_break: exclusive_oplocks_open < 0 (%d). PANIC ERROR\n", exclusive_oplocks_open)); + abort(); + } + + if( DEBUGLVL( 3 ) ) { + dbgtext( "oplock_break: returning success for " ); + dbgtext( "dev = %x, inode = %.0f, file_id = %lu\n", (unsigned int)dev, (double)inode, file_id ); + dbgtext( "Current exclusive_oplocks_open = %d\n", exclusive_oplocks_open ); + } + + return True; } /**************************************************************************** @@ -896,212 +866,187 @@ Send an oplock break message to another smbd process. If the oplock is held by the local smbd then call the oplock break function directly. ****************************************************************************/ -BOOL request_oplock_break(share_mode_entry *share_entry, - SMB_DEV_T dev, SMB_INO_T inode) +BOOL request_oplock_break(share_mode_entry *share_entry) { - char op_break_msg[OPLOCK_BREAK_MSG_LEN]; - struct sockaddr_in addr_out; - pid_t pid = sys_getpid(); - time_t start_time; - int time_left; - long usec; - time_t sec; - - if(pid == share_entry->pid) - { - /* We are breaking our own oplock, make sure it's us. */ - if(share_entry->op_port != global_oplock_port) - { - DEBUG(0,("request_oplock_break: corrupt share mode entry - pid = %d, port = %d \ + char op_break_msg[OPLOCK_BREAK_MSG_LEN]; + struct sockaddr_in addr_out; + pid_t pid = sys_getpid(); + time_t start_time; + int time_left; + SMB_DEV_T dev = share_entry->dev; + SMB_INO_T inode = share_entry->inode; + unsigned long file_id = share_entry->share_file_id; + + if(pid == share_entry->pid) { + /* We are breaking our own oplock, make sure it's us. */ + if(share_entry->op_port != global_oplock_port) { + DEBUG(0,("request_oplock_break: corrupt share mode entry - pid = %d, port = %d \ should be %d\n", (int)pid, share_entry->op_port, global_oplock_port)); - return False; - } + return False; + } - DEBUG(5,("request_oplock_break: breaking our own oplock\n")); + DEBUG(5,("request_oplock_break: breaking our own oplock\n")); #if 1 /* JRA PARANOIA TEST.... */ - { - files_struct *fsp = file_find_dit(dev, inode, &share_entry->time); - if (!fsp) { - DEBUG(0,("request_oplock_break: PANIC : breaking our own oplock requested for \ -dev = %x, inode = %.0f, tv_sec = %x, tv_usec = %x and no fsp found !\n", - (unsigned int)dev, (double)inode, (int)share_entry->time.tv_sec, - (int)share_entry->time.tv_usec )); - smb_panic("request_oplock_break: no fsp found for our own oplock\n"); - } - } + { + files_struct *fsp = file_find_dif(dev, inode, file_id); + if (!fsp) { + DEBUG(0,("request_oplock_break: PANIC : breaking our own oplock requested for \ +dev = %x, inode = %.0f, file_id = %lu and no fsp found !\n", + (unsigned int)dev, (double)inode, file_id )); + smb_panic("request_oplock_break: no fsp found for our own oplock\n"); + } + } #endif /* END JRA PARANOIA TEST... */ - /* Call oplock break direct. */ - return oplock_break(dev, inode, &share_entry->time, True); - } - - /* We need to send a OPLOCK_BREAK_CMD message to the - port in the share mode entry. */ - - if (LEVEL_II_OPLOCK_TYPE(share_entry->op_type)) { - SSVAL(op_break_msg,OPBRK_MESSAGE_CMD_OFFSET,LEVEL_II_OPLOCK_BREAK_CMD); - } else { - SSVAL(op_break_msg,OPBRK_MESSAGE_CMD_OFFSET,OPLOCK_BREAK_CMD); - } - memcpy(op_break_msg+OPLOCK_BREAK_PID_OFFSET,(char *)&pid,sizeof(pid)); - sec = (time_t)share_entry->time.tv_sec; - memcpy(op_break_msg+OPLOCK_BREAK_SEC_OFFSET,(char *)&sec,sizeof(sec)); - usec = (long)share_entry->time.tv_usec; - memcpy(op_break_msg+OPLOCK_BREAK_USEC_OFFSET,(char *)&usec,sizeof(usec)); - memcpy(op_break_msg+OPLOCK_BREAK_DEV_OFFSET,(char *)&dev,sizeof(dev)); - memcpy(op_break_msg+OPLOCK_BREAK_INODE_OFFSET,(char *)&inode,sizeof(inode)); - - /* set the address and port */ - memset((char *)&addr_out,'\0',sizeof(addr_out)); - addr_out.sin_addr.s_addr = htonl(INADDR_LOOPBACK); - addr_out.sin_port = htons( share_entry->op_port ); - addr_out.sin_family = AF_INET; + /* Call oplock break direct. */ + return oplock_break(dev, inode, file_id, True); + } + + /* We need to send a OPLOCK_BREAK_CMD message to the port in the share mode entry. */ + + if (LEVEL_II_OPLOCK_TYPE(share_entry->op_type)) { + SSVAL(op_break_msg,OPBRK_MESSAGE_CMD_OFFSET,LEVEL_II_OPLOCK_BREAK_CMD); + } else { + SSVAL(op_break_msg,OPBRK_MESSAGE_CMD_OFFSET,OPLOCK_BREAK_CMD); + } + + memcpy(op_break_msg+OPLOCK_BREAK_PID_OFFSET,(char *)&pid,sizeof(pid)); + memcpy(op_break_msg+OPLOCK_BREAK_DEV_OFFSET,(char *)&dev,sizeof(dev)); + memcpy(op_break_msg+OPLOCK_BREAK_INODE_OFFSET,(char *)&inode,sizeof(inode)); + memcpy(op_break_msg+OPLOCK_BREAK_FILEID_OFFSET,(char *)&file_id,sizeof(file_id)); + + /* Set the address and port. */ + memset((char *)&addr_out,'\0',sizeof(addr_out)); + addr_out.sin_addr.s_addr = htonl(INADDR_LOOPBACK); + addr_out.sin_port = htons( share_entry->op_port ); + addr_out.sin_family = AF_INET; - if( DEBUGLVL( 3 ) ) - { - dbgtext( "request_oplock_break: sending a oplock break message to " ); - dbgtext( "pid %d on port %d ", (int)share_entry->pid, share_entry->op_port ); - dbgtext( "for dev = %x, inode = %.0f, tv_sec = %x, tv_usec = %x\n", - (unsigned int)dev, (double)inode, (int)share_entry->time.tv_sec, - (int)share_entry->time.tv_usec ); - - } - - if(sendto(oplock_sock,op_break_msg,OPLOCK_BREAK_MSG_LEN,0, - (struct sockaddr *)&addr_out,sizeof(addr_out)) < 0) - { - if( DEBUGLVL( 0 ) ) - { - dbgtext( "request_oplock_break: failed when sending a oplock " ); - dbgtext( "break message to pid %d ", (int)share_entry->pid ); - dbgtext( "on port %d ", share_entry->op_port ); - dbgtext( "for dev = %x, inode = %.0f, tv_sec = %x, tv_usec = %x\n", - (unsigned int)dev, (double)inode, (int)share_entry->time.tv_sec, - (int)share_entry->time.tv_usec ); - dbgtext( "Error was %s\n", strerror(errno) ); - } - return False; - } - - /* - * If we just sent a message to a level II oplock share entry then - * we are done and may return. - */ - - if (LEVEL_II_OPLOCK_TYPE(share_entry->op_type)) { - DEBUG(3,("request_oplock_break: sent break message to level II entry.\n")); - return True; - } - - /* - * Now we must await the oplock broken message coming back - * from the target smbd process. Timeout if it fails to - * return in (OPLOCK_BREAK_TIMEOUT + OPLOCK_BREAK_TIMEOUT_FUDGEFACTOR) seconds. - * While we get messages that aren't ours, loop. - */ - - start_time = time(NULL); - time_left = OPLOCK_BREAK_TIMEOUT+OPLOCK_BREAK_TIMEOUT_FUDGEFACTOR; - - while(time_left >= 0) - { - char op_break_reply[OPBRK_CMD_HEADER_LEN+OPLOCK_BREAK_MSG_LEN]; - uint16 reply_from_port; - char *reply_msg_start; - fd_set fds; - - FD_ZERO(&fds); - FD_SET(oplock_sock,&fds); - - if (koplocks && koplocks->notification_fd != -1) { - FD_SET(koplocks->notification_fd, &fds); - } - - if(receive_local_message(&fds, op_break_reply, sizeof(op_break_reply), - time_left ? time_left * 1000 : 1) == False) - { - if(smb_read_error == READ_TIMEOUT) - { - if( DEBUGLVL( 0 ) ) - { - dbgtext( "request_oplock_break: no response received to oplock " ); - dbgtext( "break request to pid %d ", (int)share_entry->pid ); - dbgtext( "on port %d ", share_entry->op_port ); - dbgtext( "for dev = %x, inode = %.0f\n", (unsigned int)dev, (double)inode ); - dbgtext( "for dev = %x, inode = %.0f, tv_sec = %x, tv_usec = %x\n", - (unsigned int)dev, (double)inode, (int)share_entry->time.tv_sec, - (int)share_entry->time.tv_usec ); - } - - /* - * This is a hack to make handling of failing clients more robust. - * If a oplock break response message is not received in the timeout - * period we may assume that the smbd servicing that client holding - * the oplock has died and the client changes were lost anyway, so - * we should continue to try and open the file. - */ - break; - } - else - if( DEBUGLVL( 0 ) ) - { - dbgtext( "request_oplock_break: error in response received " ); - dbgtext( "to oplock break request to pid %d ", (int)share_entry->pid ); - dbgtext( "on port %d ", share_entry->op_port ); - dbgtext( "for dev = %x, inode = %.0f, tv_sec = %x, tv_usec = %x\n", - (unsigned int)dev, (double)inode, (int)share_entry->time.tv_sec, - (int)share_entry->time.tv_usec ); - dbgtext( "Error was (%s).\n", strerror(errno) ); - } - return False; - } - - reply_from_port = SVAL(op_break_reply,OPBRK_CMD_PORT_OFFSET); - - reply_msg_start = &op_break_reply[OPBRK_CMD_HEADER_LEN]; - - - /* - * Test to see if this is the reply we are awaiting. - */ - if((SVAL(reply_msg_start,OPBRK_MESSAGE_CMD_OFFSET) & CMD_REPLY) && - ((SVAL(reply_msg_start,OPBRK_MESSAGE_CMD_OFFSET) & ~CMD_REPLY) == OPLOCK_BREAK_CMD) && - (reply_from_port == share_entry->op_port) && - (memcmp(&reply_msg_start[OPLOCK_BREAK_PID_OFFSET], - &op_break_msg[OPLOCK_BREAK_PID_OFFSET], - OPLOCK_BREAK_MSG_LEN - OPLOCK_BREAK_PID_OFFSET) == 0)) - { - /* - * This is the reply we've been waiting for. - */ - break; - } - else - { - /* - * This is another message - a break request. - * Note that both kernel oplock break requests - * and UDP inter-smbd oplock break requests will - * be processed here. - * - * Process it to prevent potential deadlock. - * Note that the code in switch_message() prevents - * us from recursing into here as any SMB requests - * we might process that would cause another oplock - * break request to be made will be queued. - * JRA. - */ - - process_local_message(op_break_reply, sizeof(op_break_reply)); - } - - time_left -= (time(NULL) - start_time); - } - - DEBUG(3,("request_oplock_break: broke oplock.\n")); - - return True; + if( DEBUGLVL( 3 ) ) { + dbgtext( "request_oplock_break: sending a oplock break message to " ); + dbgtext( "pid %d on port %d ", (int)share_entry->pid, share_entry->op_port ); + dbgtext( "for dev = %x, inode = %.0f, file_id = %lu\n", + (unsigned int)dev, (double)inode, file_id ); + } + + if(sendto(oplock_sock,op_break_msg,OPLOCK_BREAK_MSG_LEN,0, + (struct sockaddr *)&addr_out,sizeof(addr_out)) < 0) { + if( DEBUGLVL( 0 ) ) { + dbgtext( "request_oplock_break: failed when sending a oplock " ); + dbgtext( "break message to pid %d ", (int)share_entry->pid ); + dbgtext( "on port %d ", share_entry->op_port ); + dbgtext( "for dev = %x, inode = %.0f, file_id = %lu\n", + (unsigned int)dev, (double)inode, file_id ); + dbgtext( "Error was %s\n", strerror(errno) ); + } + return False; + } + + /* + * If we just sent a message to a level II oplock share entry then + * we are done and may return. + */ + + if (LEVEL_II_OPLOCK_TYPE(share_entry->op_type)) { + DEBUG(3,("request_oplock_break: sent break message to level II entry.\n")); + return True; + } + + /* + * Now we must await the oplock broken message coming back + * from the target smbd process. Timeout if it fails to + * return in (OPLOCK_BREAK_TIMEOUT + OPLOCK_BREAK_TIMEOUT_FUDGEFACTOR) seconds. + * While we get messages that aren't ours, loop. + */ + + start_time = time(NULL); + time_left = OPLOCK_BREAK_TIMEOUT+OPLOCK_BREAK_TIMEOUT_FUDGEFACTOR; + + while(time_left >= 0) { + char op_break_reply[OPBRK_CMD_HEADER_LEN+OPLOCK_BREAK_MSG_LEN]; + uint16 reply_from_port; + char *reply_msg_start; + fd_set fds; + + FD_ZERO(&fds); + FD_SET(oplock_sock,&fds); + + if (koplocks && koplocks->notification_fd != -1) { + FD_SET(koplocks->notification_fd, &fds); + } + + if(receive_local_message(&fds, op_break_reply, sizeof(op_break_reply), + time_left ? time_left * 1000 : 1) == False) { + if(smb_read_error == READ_TIMEOUT) { + if( DEBUGLVL( 0 ) ) { + dbgtext( "request_oplock_break: no response received to oplock " ); + dbgtext( "break request to pid %d ", (int)share_entry->pid ); + dbgtext( "on port %d ", share_entry->op_port ); + dbgtext( "for dev = %x, inode = %.0f, file_id = %lu\n", + (unsigned int)dev, (double)inode, file_id ); + } + + /* + * This is a hack to make handling of failing clients more robust. + * If a oplock break response message is not received in the timeout + * period we may assume that the smbd servicing that client holding + * the oplock has died and the client changes were lost anyway, so + * we should continue to try and open the file. + */ + break; + } else { + if( DEBUGLVL( 0 ) ) { + dbgtext( "request_oplock_break: error in response received " ); + dbgtext( "to oplock break request to pid %d ", (int)share_entry->pid ); + dbgtext( "on port %d ", share_entry->op_port ); + dbgtext( "for dev = %x, inode = %.0f, file_id = %lu\n", + (unsigned int)dev, (double)inode, file_id ); + dbgtext( "Error was (%s).\n", strerror(errno) ); + } + } + return False; + } + + reply_from_port = SVAL(op_break_reply,OPBRK_CMD_PORT_OFFSET); + reply_msg_start = &op_break_reply[OPBRK_CMD_HEADER_LEN]; + + /* + * Test to see if this is the reply we are awaiting. + */ + if((SVAL(reply_msg_start,OPBRK_MESSAGE_CMD_OFFSET) & CMD_REPLY) && + ((SVAL(reply_msg_start,OPBRK_MESSAGE_CMD_OFFSET) & ~CMD_REPLY) == OPLOCK_BREAK_CMD) && + (reply_from_port == share_entry->op_port) && + (memcmp(&reply_msg_start[OPLOCK_BREAK_PID_OFFSET], &op_break_msg[OPLOCK_BREAK_PID_OFFSET], + OPLOCK_BREAK_MSG_LEN - OPLOCK_BREAK_PID_OFFSET) == 0)) { + + /* + * This is the reply we've been waiting for. + */ + break; + } else { + /* + * This is another message - a break request. + * Note that both kernel oplock break requests + * and UDP inter-smbd oplock break requests will + * be processed here. + * + * Process it to prevent potential deadlock. + * Note that the code in switch_message() prevents + * us from recursing into here as any SMB requests + * we might process that would cause another oplock + * break request to be made will be queued. + * JRA. + */ + + process_local_message(op_break_reply, sizeof(op_break_reply)); + } + + time_left -= (time(NULL) - start_time); + } + + DEBUG(3,("request_oplock_break: broke oplock.\n")); + + return True; } /**************************************************************************** @@ -1111,20 +1056,20 @@ dev = %x, inode = %.0f, tv_sec = %x, tv_usec = %x and no fsp found !\n", Used as a last ditch attempt to free a space in the file table when we have run out. ****************************************************************************/ + BOOL attempt_close_oplocked_file(files_struct *fsp) { + DEBUG(5,("attempt_close_oplocked_file: checking file %s.\n", fsp->fsp_name)); - DEBUG(5,("attempt_close_oplocked_file: checking file %s.\n", fsp->fsp_name)); - - if (EXCLUSIVE_OPLOCK_TYPE(fsp->oplock_type) && !fsp->sent_oplock_break && (fsp->fd != -1)) { - /* Try and break the oplock. */ - if (oplock_break(fsp->dev, fsp->inode, &fsp->open_time, True)) { - if(file_find_fsp(fsp) == NULL) /* Did the oplock break close the file ? */ - return True; - } - } + if (EXCLUSIVE_OPLOCK_TYPE(fsp->oplock_type) && !fsp->sent_oplock_break && (fsp->fd != -1)) { + /* Try and break the oplock. */ + if (oplock_break(fsp->dev, fsp->inode, fsp->file_id, True)) { + if(file_find_fsp(fsp) == NULL) /* Did the oplock break close the file ? */ + return True; + } + } - return False; + return False; } /**************************************************************************** @@ -1192,7 +1137,7 @@ void release_level_2_oplocks_on_change(files_struct *fsp) */ if (pid == share_entry->pid) { - files_struct *new_fsp = file_find_dit(fsp->dev, fsp->inode, &share_entry->time); + files_struct *new_fsp = file_find_dif(share_entry->dev, share_entry->inode, share_entry->share_file_id); /* Paranoia check... */ if(new_fsp == NULL) { @@ -1213,7 +1158,7 @@ void release_level_2_oplocks_on_change(files_struct *fsp) */ DEBUG(10,("release_level_2_oplocks_on_change: breaking remote oplock.\n")); - request_oplock_break(share_entry, fsp->dev, fsp->inode); + request_oplock_break(share_entry); } } @@ -1231,6 +1176,7 @@ void release_level_2_oplocks_on_change(files_struct *fsp) /**************************************************************************** setup oplocks for this process ****************************************************************************/ + BOOL init_oplocks(void) { struct sockaddr_in sock_name; diff --git a/source/smbd/oplock_irix.c b/source/smbd/oplock_irix.c index faf7e8e3c87..10520461753 100644 --- a/source/smbd/oplock_irix.c +++ b/source/smbd/oplock_irix.c @@ -22,14 +22,14 @@ #include "includes.h" #if HAVE_KERNEL_OPLOCKS_IRIX -extern int DEBUGLEVEL; static int oplock_pipe_write = -1; static int oplock_pipe_read = -1; /**************************************************************************** -test to see if IRIX kernel oplocks work + Test to see if IRIX kernel oplocks work. ****************************************************************************/ + static BOOL irix_oplocks_available(void) { int fd; @@ -82,106 +82,113 @@ Disabling kernel oplock support.\n", strerror(errno) )); return True; } - - /**************************************************************************** * Deal with the IRIX kernel <--> smbd * oplock break protocol. ****************************************************************************/ + static BOOL irix_oplock_receive_message(fd_set *fds, char *buffer, int buffer_len) { extern int smb_read_error; - oplock_stat_t os; - SMB_DEV_T dev; - SMB_INO_T inode; - char dummy; - - /* - * Read one byte of zero to clear the - * kernel break notify message. - */ - - if(read(oplock_pipe_read, &dummy, 1) != 1) { - DEBUG(0,("receive_local_message: read of kernel notification failed. \ + oplock_stat_t os; + char dummy; + files_struct *fsp; + + /* + * Read one byte of zero to clear the + * kernel break notify message. + */ + + if(read(oplock_pipe_read, &dummy, 1) != 1) { + DEBUG(0,("receive_local_message: read of kernel notification failed. \ Error was %s.\n", strerror(errno) )); - smb_read_error = READ_ERROR; - return False; - } - - /* - * Do a query to get the - * device and inode of the file that has the break - * request outstanding. - */ - - if(fcntl(oplock_pipe_read, F_OPLKSTAT, &os) < 0) { - DEBUG(0,("receive_local_message: fcntl of kernel notification failed. \ + smb_read_error = READ_ERROR; + return False; + } + + /* + * Do a query to get the + * device and inode of the file that has the break + * request outstanding. + */ + + if(fcntl(oplock_pipe_read, F_OPLKSTAT, &os) < 0) { + DEBUG(0,("receive_local_message: fcntl of kernel notification failed. \ Error was %s.\n", strerror(errno) )); - if(errno == EAGAIN) { - /* - * Duplicate kernel break message - ignore. - */ - memset(buffer, '\0', KERNEL_OPLOCK_BREAK_MSG_LEN); - return True; - } - smb_read_error = READ_ERROR; - return False; - } - - dev = (SMB_DEV_T)os.os_dev; - inode = (SMB_INO_T)os.os_ino; - - DEBUG(5,("receive_local_message: kernel oplock break request received for \ -dev = %x, inode = %.0f\n", (unsigned int)dev, (double)inode )); - - /* - * Create a kernel oplock break message. - */ - - /* Setup the message header */ - SIVAL(buffer,OPBRK_CMD_LEN_OFFSET,KERNEL_OPLOCK_BREAK_MSG_LEN); - SSVAL(buffer,OPBRK_CMD_PORT_OFFSET,0); - - buffer += OPBRK_CMD_HEADER_LEN; + if(errno == EAGAIN) { + /* + * Duplicate kernel break message - ignore. + */ + memset(buffer, '\0', KERNEL_OPLOCK_BREAK_MSG_LEN); + return True; + } + smb_read_error = READ_ERROR; + return False; + } + + /* + * We only have device and inode info here - we have to guess that this + * is the first fsp open with this dev,ino pair. + */ + + if ((fsp = file_find_di_first((SMB_DEV_T)os.os_dev, (SMB_INO_T)os.os_ino)) == NULL) { + DEBUG(0,("receive_local_message: unable to find open file with dev = %x, inode = %.0f\n", + (unsigned int)os.os_dev, (double)os.os_ino )); + return False; + } - SSVAL(buffer,OPBRK_MESSAGE_CMD_OFFSET,KERNEL_OPLOCK_BREAK_CMD); + DEBUG(5,("receive_local_message: kernel oplock break request received for \ +dev = %x, inode = %.0f\n, file_id = %ul", (unsigned int)fsp->dev, (double)fsp->inode, fsp->file_id )); - memcpy(buffer + KERNEL_OPLOCK_BREAK_DEV_OFFSET, (char *)&dev, sizeof(dev)); - memcpy(buffer + KERNEL_OPLOCK_BREAK_INODE_OFFSET, (char *)&inode, sizeof(inode)); + /* + * Create a kernel oplock break message. + */ + + /* Setup the message header */ + SIVAL(buffer,OPBRK_CMD_LEN_OFFSET,KERNEL_OPLOCK_BREAK_MSG_LEN); + SSVAL(buffer,OPBRK_CMD_PORT_OFFSET,0); + + buffer += OPBRK_CMD_HEADER_LEN; - return True; + SSVAL(buffer,OPBRK_MESSAGE_CMD_OFFSET,KERNEL_OPLOCK_BREAK_CMD); + + memcpy(buffer + KERNEL_OPLOCK_BREAK_DEV_OFFSET, (char *)&fsp->dev, sizeof(fsp->dev)); + memcpy(buffer + KERNEL_OPLOCK_BREAK_INODE_OFFSET, (char *)&fsp->inode, sizeof(fsp->inode)); + memcpy(buffer + KERNEL_OPLOCK_BREAK_FILEID_OFFSET, (char *)&fsp->file_id, sizeof(fsp->file_id)); + + return True; } - /**************************************************************************** Attempt to set an kernel oplock on a file. ****************************************************************************/ + static BOOL irix_set_kernel_oplock(files_struct *fsp, int oplock_type) { if (fcntl(fsp->fd, F_OPLKREG, oplock_pipe_write) == -1) { if(errno != EAGAIN) { DEBUG(0,("set_file_oplock: Unable to get kernel oplock on file %s, dev = %x, \ -inode = %.0f. Error was %s\n", - fsp->fsp_name, (unsigned int)fsp->dev, (double)fsp->inode, +inode = %.0f, file_id = %ul. Error was %s\n", + fsp->fsp_name, (unsigned int)fsp->dev, (double)fsp->inode, fsp->file_id, strerror(errno) )); } else { DEBUG(5,("set_file_oplock: Refused oplock on file %s, fd = %d, dev = %x, \ -inode = %.0f. Another process had the file open.\n", - fsp->fsp_name, fsp->fd, (unsigned int)fsp->dev, (double)fsp->inode )); +inode = %.0f, file_id = %ul. Another process had the file open.\n", + fsp->fsp_name, fsp->fd, (unsigned int)fsp->dev, (double)fsp->inode, fsp->file_id )); } return False; } - DEBUG(10,("set_file_oplock: got kernel oplock on file %s, dev = %x, inode = %.0f\n", - fsp->fsp_name, (unsigned int)fsp->dev, (double)fsp->inode)); + DEBUG(10,("set_file_oplock: got kernel oplock on file %s, dev = %x, inode = %.0f, file_id = %ul\n", + fsp->fsp_name, (unsigned int)fsp->dev, (double)fsp->inode, fsp->file_id)); return True; } - /**************************************************************************** Release a kernel oplock on a file. ****************************************************************************/ + static void irix_release_kernel_oplock(files_struct *fsp) { if (DEBUGLVL(10)) { @@ -190,9 +197,9 @@ static void irix_release_kernel_oplock(files_struct *fsp) * oplock state of this file. */ int state = fcntl(fsp->fd, F_OPLKACK, -1); - dbgtext("release_kernel_oplock: file %s, dev = %x, inode = %.0f has kernel \ + dbgtext("release_kernel_oplock: file %s, dev = %x, inode = %.0f file_id = %ul, has kernel \ oplock state of %x.\n", fsp->fsp_name, (unsigned int)fsp->dev, - (double)fsp->inode, state ); + (double)fsp->inode, fsp->file_id, state ); } /* @@ -201,18 +208,19 @@ oplock state of %x.\n", fsp->fsp_name, (unsigned int)fsp->dev, if(fcntl(fsp->fd, F_OPLKACK, OP_REVOKE) < 0) { if( DEBUGLVL( 0 )) { dbgtext("release_kernel_oplock: Error when removing kernel oplock on file " ); - dbgtext("%s, dev = %x, inode = %.0f. Error was %s\n", + dbgtext("%s, dev = %x, inode = %.0f, file_id = %ul. Error was %s\n", fsp->fsp_name, (unsigned int)fsp->dev, - (double)fsp->inode, strerror(errno) ); + (double)fsp->inode, fsp->file_id, strerror(errno) ); } } } - /**************************************************************************** -parse a kernel oplock message + Parse a kernel oplock message. ****************************************************************************/ -static BOOL irix_kernel_oplock_parse(char *msg_start, int msg_len, SMB_INO_T *inode, SMB_DEV_T *dev) + +static BOOL irix_kernel_oplock_parse(char *msg_start, int msg_len, + SMB_INO_T *inode, SMB_DEV_T *dev, unsigned long *file_id) { /* Ensure that the msg length is correct. */ if(msg_len != KERNEL_OPLOCK_BREAK_MSG_LEN) { @@ -221,36 +229,39 @@ static BOOL irix_kernel_oplock_parse(char *msg_start, int msg_len, SMB_INO_T *in return False; } - memcpy((char *)inode, msg_start+KERNEL_OPLOCK_BREAK_INODE_OFFSET, sizeof(*inode)); - memcpy((char *)dev, msg_start+KERNEL_OPLOCK_BREAK_DEV_OFFSET, sizeof(*dev)); + memcpy((char *)inode, msg_start+KERNEL_OPLOCK_BREAK_INODE_OFFSET, sizeof(*inode)); + memcpy((char *)dev, msg_start+KERNEL_OPLOCK_BREAK_DEV_OFFSET, sizeof(*dev)); + memcpy((char *)file_id, msg_start+KERNEL_OPLOCK_BREAK_FILEID_OFFSET, sizeof(*file_id)); - DEBUG(5,("kernel oplock break request for file dev = %x, inode = %.0f\n", - (unsigned int)*dev, (double)*inode)); + DEBUG(5,("kernel oplock break request for file dev = %x, inode = %.0f, file_id = %ul\n", + (unsigned int)*dev, (double)*inode, *file_id)); return True; } - /**************************************************************************** -set *maxfd to include oplock read pipe + Set *maxfd to include oplock read pipe. ****************************************************************************/ + static BOOL irix_oplock_msg_waiting(fd_set *fds) { - if (oplock_pipe_read == -1) return False; + if (oplock_pipe_read == -1) + return False; return FD_ISSET(oplock_pipe_read,fds); } - /**************************************************************************** -setup kernel oplocks + Setup kernel oplocks. ****************************************************************************/ + struct kernel_oplocks *irix_init_kernel_oplocks(void) { int pfd[2]; static struct kernel_oplocks koplocks; - if (!irix_oplocks_available()) return NULL; + if (!irix_oplocks_available()) + return NULL; if(pipe(pfd) != 0) { DEBUG(0,("setup_kernel_oplock_pipe: Unable to create pipe. Error was %s\n", @@ -270,9 +281,6 @@ struct kernel_oplocks *irix_init_kernel_oplocks(void) return &koplocks; } - - - #else void oplock_irix_dummy(void) {} #endif /* HAVE_KERNEL_OPLOCKS_IRIX */ diff --git a/source/smbd/oplock_linux.c b/source/smbd/oplock_linux.c index 39ee3eb86b3..f42d55d2978 100644 --- a/source/smbd/oplock_linux.c +++ b/source/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 */ @@ -50,8 +48,9 @@ static VOLATILE sig_atomic_t fd_pending; /* the fd of the current pending signal #endif /**************************************************************************** -handle a LEASE signal, incrementing the signals_received and blocking the signal + Handle a LEASE signal, incrementing the signals_received and blocking the signal. ****************************************************************************/ + static void signal_handler(int sig, siginfo_t *info, void *unused) { BlockSignals(True, sig); @@ -61,8 +60,10 @@ static void signal_handler(int sig, siginfo_t *info, void *unused) } /**************************************************************************** -try to gain a linux capability -****************************************************************************/static void set_capability(unsigned capability) + Try to gain a linux capability. +****************************************************************************/ + +static void set_capability(unsigned capability) { #ifndef _LINUX_CAPABILITY_VERSION #define _LINUX_CAPABILITY_VERSION 0x19980330 @@ -94,11 +95,11 @@ try to gain a linux capability } } - /**************************************************************************** -call SETLEASE. If we get EACCES then we try setting up the right capability and -try again + Call SETLEASE. If we get EACCES then we try setting up the right capability and + try again ****************************************************************************/ + static int linux_setlease(int fd, int leasetype) { int ret; @@ -117,31 +118,27 @@ static int linux_setlease(int fd, int leasetype) return ret; } - /**************************************************************************** * Deal with the Linux kernel <--> smbd * oplock break protocol. ****************************************************************************/ + static BOOL linux_oplock_receive_message(fd_set *fds, char *buffer, int buffer_len) { - SMB_DEV_T dev; - SMB_INO_T inode; - SMB_STRUCT_STAT sbuf; BOOL ret = True; + struct files_struct *fsp; - if (signals_received == signals_processed) return False; + if (signals_received == signals_processed) + return False; - if (sys_fstat((int)fd_pending,&sbuf) == -1) { + if ((fsp = file_find_fd(fd_pending)) == NULL) { DEBUG(0,("Invalid file descriptor %d in kernel oplock break!\n", (int)fd_pending)); ret = False; goto out; } - dev = sbuf.st_dev; - inode = sbuf.st_ino; - DEBUG(3,("receive_local_message: kernel oplock break request received for \ -dev = %x, inode = %.0f\n", (unsigned int)dev, (double)inode )); +dev = %x, inode = %.0f\n", (unsigned int)fsp->dev, (double)fsp->inode )); /* * Create a kernel oplock break message. @@ -155,8 +152,9 @@ dev = %x, inode = %.0f\n", (unsigned int)dev, (double)inode )); SSVAL(buffer,OPBRK_MESSAGE_CMD_OFFSET,KERNEL_OPLOCK_BREAK_CMD); - memcpy(buffer + KERNEL_OPLOCK_BREAK_DEV_OFFSET, (char *)&dev, sizeof(dev)); - memcpy(buffer + KERNEL_OPLOCK_BREAK_INODE_OFFSET, (char *)&inode, sizeof(inode)); + memcpy(buffer + KERNEL_OPLOCK_BREAK_DEV_OFFSET, (char *)&fsp->dev, sizeof(fsp->dev)); + memcpy(buffer + KERNEL_OPLOCK_BREAK_INODE_OFFSET, (char *)&fsp->inode, sizeof(fsp->inode)); + memcpy(buffer + KERNEL_OPLOCK_BREAK_FILEID_OFFSET, (char *)&fsp->file_id, sizeof(fsp->file_id)); out: /* now we can receive more signals */ @@ -167,10 +165,10 @@ dev = %x, inode = %.0f\n", (unsigned int)dev, (double)inode )); return ret; } - /**************************************************************************** Attempt to set an kernel oplock on a file. ****************************************************************************/ + static BOOL linux_set_kernel_oplock(files_struct *fsp, int oplock_type) { if (linux_setlease(fsp->fd, F_WRLCK) == -1) { @@ -181,16 +179,16 @@ inode = %.0f. (%s)\n", return False; } - DEBUG(3,("set_file_oplock: got kernel oplock on file %s, dev = %x, inode = %.0f\n", - fsp->fsp_name, (unsigned int)fsp->dev, (double)fsp->inode)); + DEBUG(3,("set_file_oplock: got kernel oplock on file %s, dev = %x, inode = %.0f, file_id = %ul\n", + fsp->fsp_name, (unsigned int)fsp->dev, (double)fsp->inode, fsp->file_id)); return True; } - /**************************************************************************** Release a kernel oplock on a file. ****************************************************************************/ + static void linux_release_kernel_oplock(files_struct *fsp) { if (DEBUGLVL(10)) { @@ -199,9 +197,9 @@ static void linux_release_kernel_oplock(files_struct *fsp) * oplock state of this file. */ int state = fcntl(fsp->fd, F_GETLEASE, 0); - dbgtext("release_kernel_oplock: file %s, dev = %x, inode = %.0f has kernel \ + dbgtext("release_kernel_oplock: file %s, dev = %x, inode = %.0f file_id = %ul has kernel \ oplock state of %x.\n", fsp->fsp_name, (unsigned int)fsp->dev, - (double)fsp->inode, state ); + (double)fsp->inode, fsp->file_id, state ); } /* @@ -210,18 +208,19 @@ oplock state of %x.\n", fsp->fsp_name, (unsigned int)fsp->dev, if (linux_setlease(fsp->fd, F_UNLCK) == -1) { if (DEBUGLVL(0)) { dbgtext("release_kernel_oplock: Error when removing kernel oplock on file " ); - dbgtext("%s, dev = %x, inode = %.0f. Error was %s\n", + dbgtext("%s, dev = %x, inode = %.0f, file_id = %ul. Error was %s\n", fsp->fsp_name, (unsigned int)fsp->dev, - (double)fsp->inode, strerror(errno) ); + (double)fsp->inode, fsp->file_id, strerror(errno) ); } } } - /**************************************************************************** -parse a kernel oplock message + Parse a kernel oplock message. ****************************************************************************/ -static BOOL linux_kernel_oplock_parse(char *msg_start, int msg_len, SMB_INO_T *inode, SMB_DEV_T *dev) + +static BOOL linux_kernel_oplock_parse(char *msg_start, int msg_len, SMB_INO_T *inode, + SMB_DEV_T *dev, unsigned long *file_id) { /* Ensure that the msg length is correct. */ if (msg_len != KERNEL_OPLOCK_BREAK_MSG_LEN) { @@ -230,41 +229,44 @@ static BOOL linux_kernel_oplock_parse(char *msg_start, int msg_len, SMB_INO_T *i return False; } - memcpy((char *)inode, msg_start+KERNEL_OPLOCK_BREAK_INODE_OFFSET, sizeof(*inode)); - memcpy((char *)dev, msg_start+KERNEL_OPLOCK_BREAK_DEV_OFFSET, sizeof(*dev)); + memcpy((char *)inode, msg_start+KERNEL_OPLOCK_BREAK_INODE_OFFSET, sizeof(*inode)); + memcpy((char *)dev, msg_start+KERNEL_OPLOCK_BREAK_DEV_OFFSET, sizeof(*dev)); + memcpy((char *)file_id, msg_start+KERNEL_OPLOCK_BREAK_FILEID_OFFSET, sizeof(*file_id)); - DEBUG(3,("kernel oplock break request for file dev = %x, inode = %.0f\n", - (unsigned int)*dev, (double)*inode)); + DEBUG(3,("kernel oplock break request for file dev = %x, inode = %.0f, file_id = %ul\n", + (unsigned int)*dev, (double)*inode, *file_id)); return True; } - /**************************************************************************** -see if a oplock message is waiting + See if a oplock message is waiting. ****************************************************************************/ + static BOOL linux_oplock_msg_waiting(fd_set *fds) { return signals_processed != signals_received; } /**************************************************************************** -see if the kernel supports oplocks + See if the kernel supports oplocks. ****************************************************************************/ + static BOOL linux_oplocks_available(void) { int fd, ret; fd = open("/dev/null", O_RDONLY); - if (fd == -1) return False; /* uggh! */ + if (fd == -1) + return False; /* uggh! */ ret = fcntl(fd, F_GETLEASE, 0); close(fd); return ret == F_UNLCK; } - /**************************************************************************** -setup kernel oplocks + Setup kernel oplocks. ****************************************************************************/ + struct kernel_oplocks *linux_init_kernel_oplocks(void) { static struct kernel_oplocks koplocks; @@ -275,13 +277,13 @@ struct kernel_oplocks *linux_init_kernel_oplocks(void) return NULL; } - act.sa_handler = NULL; - act.sa_sigaction = signal_handler; - act.sa_flags = SA_SIGINFO; - if (sigaction(RT_SIGNAL_LEASE, &act, NULL) != 0) { + act.sa_handler = NULL; + act.sa_sigaction = signal_handler; + act.sa_flags = SA_SIGINFO; + if (sigaction(RT_SIGNAL_LEASE, &act, NULL) != 0) { DEBUG(0,("Failed to setup RT_SIGNAL_LEASE handler\n")); return NULL; - } + } koplocks.receive_message = linux_oplock_receive_message; koplocks.set_oplock = linux_set_kernel_oplock; @@ -294,9 +296,6 @@ struct kernel_oplocks *linux_init_kernel_oplocks(void) return &koplocks; } - - - #else void oplock_linux_dummy(void) {} #endif /* HAVE_KERNEL_OPLOCKS_LINUX */ diff --git a/source/smbd/password.c b/source/smbd/password.c index 6cd61449c20..9c921fcbd14 100644 --- a/source/smbd/password.c +++ b/source/smbd/password.c @@ -21,7 +21,6 @@ #include "includes.h" -extern int DEBUGLEVEL; extern int Protocol; extern struct in_addr ipzero; diff --git a/source/smbd/pipes.c b/source/smbd/pipes.c index 366707cd589..bc3c8ea655b 100644 --- a/source/smbd/pipes.c +++ b/source/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/source/smbd/process.c b/source/smbd/process.c index 7eab6feb871..5c1bc3e02b6 100644 --- a/source/smbd/process.c +++ b/source/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/source/smbd/quotas.c b/source/smbd/quotas.c index 46693a6fe1e..0fefaf18560 100644 --- a/source/smbd/quotas.c +++ b/source/smbd/quotas.c @@ -28,8 +28,6 @@ #include "includes.h" -extern int DEBUGLEVEL; - #if defined(VXFS_QUOTA) /* diff --git a/source/smbd/reply.c b/source/smbd/reply.c index 8e97857ef68..6d2c046c25f 100644 --- a/source/smbd/reply.c +++ b/source/smbd/reply.c @@ -28,7 +28,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/source/smbd/server.c b/source/smbd/server.c index bdd84406c32..ce8ac36b306 100644 --- a/source/smbd/server.c +++ b/source/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/source/smbd/service.c b/source/smbd/service.c index 9b77935fb3f..0b66b2550f7 100644 --- a/source/smbd/service.c +++ b/source/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; diff --git a/source/smbd/trans2.c b/source/smbd/trans2.c index 89515f6351e..6fdebff82ac 100644 --- a/source/smbd/trans2.c +++ b/source/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/source/smbd/vfs.c b/source/smbd/vfs.c index 8d049b51c4a..e165c42ee4f 100644 --- a/source/smbd/vfs.c +++ b/source/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/source/smbwrapper/shared.c b/source/smbwrapper/shared.c index 5a9f6882981..a10ef05bfca 100644 --- a/source/smbwrapper/shared.c +++ b/source/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/source/smbwrapper/smbw.c b/source/smbwrapper/smbw.c index fb2d59e689f..8f3f734d5a1 100644 --- a/source/smbwrapper/smbw.c +++ b/source/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/source/smbwrapper/smbw_dir.c b/source/smbwrapper/smbw_dir.c index 1600d65a9ef..a1069c535e6 100644 --- a/source/smbwrapper/smbw_dir.c +++ b/source/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; diff --git a/source/smbwrapper/smbw_stat.c b/source/smbwrapper/smbw_stat.c index 926075c864f..cf2d19cdf09 100644 --- a/source/smbwrapper/smbw_stat.c +++ b/source/smbwrapper/smbw_stat.c @@ -21,8 +21,6 @@ #include "includes.h" -extern int DEBUGLEVEL; - extern int smbw_busy; diff --git a/source/utils/masktest.c b/source/utils/masktest.c index a654b5bfd11..ba719bae248 100644 --- a/source/utils/masktest.c +++ b/source/utils/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/source/utils/nmblookup.c b/source/utils/nmblookup.c index 0f978a6cf3f..86c53760f3f 100644 --- a/source/utils/nmblookup.c +++ b/source/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/source/utils/pdbedit.c b/source/utils/pdbedit.c index 7006eeee4e5..b877dbfd5e2 100644 --- a/source/utils/pdbedit.c +++ b/source/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/source/utils/rpccheck.c b/source/utils/rpccheck.c index 1db7de34234..e8e61e9f718 100644 --- a/source/utils/rpccheck.c +++ b/source/utils/rpccheck.c @@ -21,8 +21,6 @@ #include "includes.h" -extern int DEBUGLEVEL; - main() { char filter[]="0123456789ABCDEF"; diff --git a/source/utils/rpctorture.c b/source/utils/rpctorture.c index c80cfe4adea..76461072b6d 100644 --- a/source/utils/rpctorture.c +++ b/source/utils/rpctorture.c @@ -35,7 +35,6 @@ extern pstring user_socket_options; extern pstring debugf; -extern int DEBUGLEVEL; extern file_info def_finfo; diff --git a/source/utils/smbfilter.c b/source/utils/smbfilter.c index db83873e694..abc8ba4a51f 100644 --- a/source/utils/smbfilter.c +++ b/source/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/source/utils/smbpasswd.c b/source/utils/smbpasswd.c index b29b5d9a97e..2dee9130c14 100644 --- a/source/utils/smbpasswd.c +++ b/source/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/source/utils/status.c b/source/utils/status.c index 28726d40f0f..293eb3d0ade 100644 --- a/source/utils/status.c +++ b/source/utils/status.c @@ -44,7 +44,6 @@ struct session_record{ struct session_record *next; } *srecs; -extern int DEBUGLEVEL; extern FILE *dbf; static pstring Ucrit_username = ""; /* added by OH */ diff --git a/source/utils/testparm.c b/source/utils/testparm.c index 10292b3033a..a86a7859089 100644 --- a/source/utils/testparm.c +++ b/source/utils/testparm.c @@ -37,7 +37,6 @@ /* these live in util.c */ extern FILE *dbf; -extern int DEBUGLEVEL; /*********************************************** Here we do a set of 'hard coded' checks for bad diff --git a/source/utils/testprns.c b/source/utils/testprns.c index c03fa0436a6..0ba5403c30a 100644 --- a/source/utils/testprns.c +++ b/source/utils/testprns.c @@ -36,7 +36,6 @@ /* these live in util.c */ extern FILE *dbf; -extern int DEBUGLEVEL; int main(int argc, char *argv[]) { |