diff options
| -rw-r--r-- | libcli/smb/smb_constants.h | 34 | ||||
| -rw-r--r-- | source3/include/smb.h | 15 | ||||
| -rw-r--r-- | source4/libcli/raw/smb.h | 34 |
3 files changed, 38 insertions, 45 deletions
diff --git a/libcli/smb/smb_constants.h b/libcli/smb/smb_constants.h index 934a022481..bde66dc879 100644 --- a/libcli/smb/smb_constants.h +++ b/libcli/smb/smb_constants.h @@ -295,6 +295,40 @@ enum csc_policy { #define FILE_TYPE_COMM_DEVICE 4 #define FILE_TYPE_UNKNOWN 0xFFFF +/* Lock types. */ +#define LOCKING_ANDX_EXCLUSIVE_LOCK 0x00 +#define LOCKING_ANDX_SHARED_LOCK 0x01 +#define LOCKING_ANDX_OPLOCK_RELEASE 0x02 +#define LOCKING_ANDX_CHANGE_LOCKTYPE 0x04 +#define LOCKING_ANDX_CANCEL_LOCK 0x08 +#define LOCKING_ANDX_LARGE_FILES 0x10 + +/* + * Bits we test with. + */ + +#define OPLOCK_NONE 0 +#define OPLOCK_EXCLUSIVE 1 +#define OPLOCK_BATCH 2 +#define OPLOCK_LEVEL_II 4 + +#define CORE_OPLOCK_GRANTED (1<<5) +#define EXTENDED_OPLOCK_GRANTED (1<<15) + +/* + * Return values for oplock types. + */ + +#define NO_OPLOCK_RETURN 0 +#define EXCLUSIVE_OPLOCK_RETURN 1 +#define BATCH_OPLOCK_RETURN 2 +#define LEVEL_II_OPLOCK_RETURN 3 + +/* oplock levels sent in oplock break */ +#define OPLOCK_BREAK_TO_NONE 0 +#define OPLOCK_BREAK_TO_LEVEL_II 1 + + /* ioctl codes */ #define IOCTL_QUERY_JOB_INFO 0x530060 diff --git a/source3/include/smb.h b/source3/include/smb.h index a3a87b6eb6..1769ec20c4 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -1151,22 +1151,15 @@ enum acl_compatibility {ACL_COMPAT_AUTO, ACL_COMPAT_WINNT, ACL_COMPAT_WIN2K}; */ #define EXTENDED_OPLOCK_REQUEST(inbuf) ((SVAL(inbuf,smb_vwv2)&((1<<1)|(1<<2)))>>1) -/* Lock types. */ -#define LOCKING_ANDX_SHARED_LOCK 0x1 -#define LOCKING_ANDX_OPLOCK_RELEASE 0x2 -#define LOCKING_ANDX_CHANGE_LOCKTYPE 0x4 -#define LOCKING_ANDX_CANCEL_LOCK 0x8 -#define LOCKING_ANDX_LARGE_FILES 0x10 - /* * Bits we test with. * Note these must fit into 16-bits. */ -#define NO_OPLOCK 0x0 -#define EXCLUSIVE_OPLOCK 0x1 -#define BATCH_OPLOCK 0x2 -#define LEVEL_II_OPLOCK 0x4 +#define NO_OPLOCK OPLOCK_NONE +#define EXCLUSIVE_OPLOCK OPLOCK_EXCLUSIVE +#define BATCH_OPLOCK OPLOCK_BATCH +#define LEVEL_II_OPLOCK OPLOCK_LEVEL_II /* The following are Samba-private. */ #define INTERNAL_OPEN_ONLY 0x8 diff --git a/source4/libcli/raw/smb.h b/source4/libcli/raw/smb.h index 38e434ec69..99dcf43edb 100644 --- a/source4/libcli/raw/smb.h +++ b/source4/libcli/raw/smb.h @@ -350,40 +350,6 @@ #define UID_FIELD_INVALID 0 -/* Lock types. */ -#define LOCKING_ANDX_EXCLUSIVE_LOCK 0x00 -#define LOCKING_ANDX_SHARED_LOCK 0x01 -#define LOCKING_ANDX_OPLOCK_RELEASE 0x02 -#define LOCKING_ANDX_CHANGE_LOCKTYPE 0x04 -#define LOCKING_ANDX_CANCEL_LOCK 0x08 -#define LOCKING_ANDX_LARGE_FILES 0x10 - -/* - * Bits we test with. - */ - -#define OPLOCK_NONE 0 -#define OPLOCK_EXCLUSIVE 1 -#define OPLOCK_BATCH 2 -#define OPLOCK_LEVEL_II 4 - -#define CORE_OPLOCK_GRANTED (1<<5) -#define EXTENDED_OPLOCK_GRANTED (1<<15) - -/* - * Return values for oplock types. - */ - -#define NO_OPLOCK_RETURN 0 -#define EXCLUSIVE_OPLOCK_RETURN 1 -#define BATCH_OPLOCK_RETURN 2 -#define LEVEL_II_OPLOCK_RETURN 3 - -/* oplock levels sent in oplock break */ -#define OPLOCK_BREAK_TO_NONE 0 -#define OPLOCK_BREAK_TO_LEVEL_II 1 - - /* The maximum length of a trust account password. Used when we randomly create it, 15 char passwords exceed NT4's max password length */ |