From c281638bc4e0dfbad8365a6354fded749960835d Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 2 Jul 2009 17:47:33 +0200 Subject: s4:libcli: move SMB2 lock flags to smb2_constants.h metze --- source4/libcli/raw/interfaces.h | 7 ------- source4/libcli/smb2/smb2_constants.h | 8 ++++++++ 2 files changed, 8 insertions(+), 7 deletions(-) (limited to 'source4') diff --git a/source4/libcli/raw/interfaces.h b/source4/libcli/raw/interfaces.h index 3c0d186b87..478b6585d4 100644 --- a/source4/libcli/raw/interfaces.h +++ b/source4/libcli/raw/interfaces.h @@ -1988,13 +1988,6 @@ union smb_lock { struct smb2_lock_element { uint64_t offset; uint64_t length; -/* these flags are the same as the SMB2 lock flags */ -#define SMB2_LOCK_FLAG_NONE 0x00000000 -#define SMB2_LOCK_FLAG_SHARED 0x00000001 -#define SMB2_LOCK_FLAG_EXCLUSIVE 0x00000002 -#define SMB2_LOCK_FLAG_UNLOCK 0x00000004 -#define SMB2_LOCK_FLAG_FAIL_IMMEDIATELY 0x00000010 -#define SMB2_LOCK_FLAG_ALL_MASK 0x00000017 uint32_t flags; uint32_t reserved; } *locks; diff --git a/source4/libcli/smb2/smb2_constants.h b/source4/libcli/smb2/smb2_constants.h index 48f30972dc..f1681a3076 100644 --- a/source4/libcli/smb2/smb2_constants.h +++ b/source4/libcli/smb2/smb2_constants.h @@ -105,6 +105,14 @@ #define SMB2_SECURITY_DYNAMIC_TRACKING 0x01 #define SMB2_SECURITY_EFFECTIVE_ONLY 0x02 +/* SMB2 lock flags */ +#define SMB2_LOCK_FLAG_NONE 0x00000000 +#define SMB2_LOCK_FLAG_SHARED 0x00000001 +#define SMB2_LOCK_FLAG_EXCLUSIVE 0x00000002 +#define SMB2_LOCK_FLAG_UNLOCK 0x00000004 +#define SMB2_LOCK_FLAG_FAIL_IMMEDIATELY 0x00000010 +#define SMB2_LOCK_FLAG_ALL_MASK 0x00000017 + /* SMB2 requested oplock levels */ #define SMB2_OPLOCK_LEVEL_NONE 0x00 #define SMB2_OPLOCK_LEVEL_II 0x01 -- cgit