From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 2 Jul 2009 15:47:33 +0000 (+0200)
Subject: s4:libcli: move SMB2 lock flags to smb2_constants.h
X-Git-Tag: talloc-2.0.0~799
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c281638bc4e0dfbad8365a6354fded749960835d;p=thirdparty%2Fsamba.git

s4:libcli: move SMB2 lock flags to smb2_constants.h

metze
---

diff --git a/source4/libcli/raw/interfaces.h b/source4/libcli/raw/interfaces.h
index 3c0d186b877..478b6585d41 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 48f30972dc9..f1681a30763 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