diff options
| author | Jeremy Allison <jra@samba.org> | 1997-10-07 18:46:19 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 1997-10-07 18:46:19 +0000 |
| commit | fb27bc139f8d321e50471c595b65b277ee114801 (patch) | |
| tree | 5fc3ae3f68a30d2bfec9f4f3c456a91f93bb34e8 /source3/include/smb.h | |
| parent | 577ae65ca562ec05849a2e9e79689d00e0a0bcf2 (diff) | |
| download | samba-fb27bc139f8d321e50471c595b65b277ee114801.tar.gz samba-fb27bc139f8d321e50471c595b65b277ee114801.tar.bz2 samba-fb27bc139f8d321e50471c595b65b277ee114801.zip | |
locking.c: Added fix for race condition in slow share mode code.
lsaparse.c: #ifdef'ed out code so this will compile - LUKE PLEASE CHECK THIS.
pipes.c: #ifdef'ed out code so this will compile - LUKE PLEASE CHECK THIS.
server.c: Fixed last known oplock race condition.
smb.h: Re-removed USE_OPLOCK defines - someone checked in an old version.
smbparse.c: #ifdef'ed out code so this will compile - LUKE PLEASE CHECK THIS.
Jeremy (jallison@whistle.com)
(This used to be commit 1e1366ddc5542283a37debdf830ca139bbade1b0)
Diffstat (limited to 'source3/include/smb.h')
| -rw-r--r-- | source3/include/smb.h | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/source3/include/smb.h b/source3/include/smb.h index 3adb3e5a4c..c347202743 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -1042,10 +1042,8 @@ typedef struct { smb_shm_offset_t next_share_mode_entry; int pid; -#ifdef USE_OPLOCKS uint16 op_port; uint16 op_type; -#endif /* USE_OPLOCKS */ int share_mode; struct timeval time; } share_mode_entry; @@ -1054,10 +1052,8 @@ typedef struct typedef struct { int pid; -#ifdef USE_OPLOCKS uint16 op_port; uint16 op_type; -#endif /* USE_OPLOCKS */ int share_mode; struct timeval time; } min_share_mode_entry; @@ -1083,11 +1079,7 @@ struct connect_record }; #ifndef LOCKING_VERSION -#ifdef USE_OPLOCKS #define LOCKING_VERSION 4 -#else /* USE_OPLOCKS */ -#define LOCKING_VERSION 3 -#endif /* USE_OPLOCKS */ #endif /* LOCKING_VERSION */ #if !defined(FAST_SHARE_MODES) @@ -1103,11 +1095,7 @@ struct connect_record #define SMF_FILENAME_LEN_OFFSET 8 #define SMF_HEADER_LENGTH 10 -#ifdef USE_OPLOCKS #define SMF_ENTRY_LENGTH 20 -#else /* USE_OPLOCKS */ -#define SMF_ENTRY_LENGTH 16 -#endif /* USE_OPLOCKS */ /* * Share mode record offsets. @@ -1117,11 +1105,8 @@ struct connect_record #define SME_USEC_OFFSET 4 #define SME_SHAREMODE_OFFSET 8 #define SME_PID_OFFSET 12 - -#ifdef USE_OPLOCKS #define SME_PORT_OFFSET 16 #define SME_OPLOCK_TYPE_OFFSET 18 -#endif /* USE_OPLOCKS */ #endif /* FAST_SHARE_MODES */ |