summaryrefslogtreecommitdiff
path: root/source3/include
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2011-10-24 11:39:28 +0200
committerStefan Metzmacher <metze@samba.org>2011-10-24 17:46:47 +0200
commitf3c25bc6a5f23a248f832fa58c59c16522ac255b (patch)
treed80783fa925cebf763703a870f54d14c01d62290 /source3/include
parent2414169241c874b3c764d91b598e1c2c0939e037 (diff)
downloadsamba-f3c25bc6a5f23a248f832fa58c59c16522ac255b.tar.gz
samba-f3c25bc6a5f23a248f832fa58c59c16522ac255b.tar.bz2
samba-f3c25bc6a5f23a248f832fa58c59c16522ac255b.zip
libcli/smb: merge LOCKING_ANDX_* and OPLOCK_* defines to smb_constants.h
metze Autobuild-User: Stefan Metzmacher <metze@samba.org> Autobuild-Date: Mon Oct 24 17:46:47 CEST 2011 on sn-devel-104
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/smb.h15
1 files changed, 4 insertions, 11 deletions
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