summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2011-10-24 09:35:48 +0200
committerStefan Metzmacher <metze@samba.org>2011-10-24 16:10:36 +0200
commit6fef69562bf142eb6d84691ed3e74623f213ce85 (patch)
treece82b48234fd57a70dc3f170a3f6fd20140dd71c
parentc9ddc5010801068a03e7f2e87c78b3a07a59e1b0 (diff)
downloadsamba-6fef69562bf142eb6d84691ed3e74623f213ce85.tar.gz
samba-6fef69562bf142eb6d84691ed3e74623f213ce85.tar.bz2
samba-6fef69562bf142eb6d84691ed3e74623f213ce85.zip
libcli/smb: move CAP_* defines to smb_constants.h
metze
-rw-r--r--libcli/smb/smb_constants.h46
-rw-r--r--source3/include/smb.h46
-rw-r--r--source4/libcli/raw/smb.h18
3 files changed, 46 insertions, 64 deletions
diff --git a/libcli/smb/smb_constants.h b/libcli/smb/smb_constants.h
index 3bedf2593b..55f3f8bdf8 100644
--- a/libcli/smb/smb_constants.h
+++ b/libcli/smb/smb_constants.h
@@ -91,6 +91,52 @@ enum smb_signing_setting {
SMB_SIGNING_OFF, SMB_SIGNING_SUPPORTED,
SMB_SIGNING_REQUIRED, SMB_SIGNING_AUTO};
+/* Capabilities. see ftp.microsoft.com/developr/drg/cifs/cifs/cifs4.txt */
+
+#define CAP_RAW_MODE 0x00000001
+#define CAP_MPX_MODE 0x00000002
+#define CAP_UNICODE 0x00000004
+#define CAP_LARGE_FILES 0x00000008
+#define CAP_NT_SMBS 0x00000010
+#define CAP_RPC_REMOTE_APIS 0x00000020
+#define CAP_STATUS32 0x00000040
+#define CAP_LEVEL_II_OPLOCKS 0x00000080
+#define CAP_LOCK_AND_READ 0x00000100
+#define CAP_NT_FIND 0x00000200
+#define CAP_DFS 0x00001000
+#define CAP_W2K_SMBS 0x00002000
+#define CAP_LARGE_READX 0x00004000
+#define CAP_LARGE_WRITEX 0x00008000
+#define CAP_LWIO 0x00010000
+#define CAP_UNIX 0x00800000 /* Capabilities for UNIX extensions. Created by HP. */
+#define CAP_DYNAMIC_REAUTH 0x20000000
+#define CAP_EXTENDED_SECURITY 0x80000000
+
+#define SMB_CAP_BOTH_MASK ( \
+ CAP_UNICODE | \
+ CAP_NT_SMBS | \
+ CAP_STATUS32 | \
+ CAP_LEVEL_II_OPLOCKS | \
+ CAP_EXTENDED_SECURITY | \
+ 0)
+#define SMB_CAP_SERVER_MASK ( \
+ CAP_RAW_MODE | \
+ CAP_MPX_MODE | \
+ CAP_LARGE_FILES | \
+ CAP_RPC_REMOTE_APIS | \
+ CAP_LOCK_AND_READ | \
+ CAP_NT_FIND | \
+ CAP_DFS | \
+ CAP_W2K_SMBS | \
+ CAP_LARGE_READX | \
+ CAP_LARGE_WRITEX | \
+ CAP_LWIO | \
+ CAP_UNIX | \
+ 0)
+#define SMB_CAP_CLIENT_MASK ( \
+ CAP_DYNAMIC_REAUTH | \
+ 0)
+
/* Client-side offline caching policy types */
enum csc_policy {
CSC_POLICY_MANUAL=0,
diff --git a/source3/include/smb.h b/source3/include/smb.h
index ace3c5efba..b1d333cbb6 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -1191,52 +1191,6 @@ http://msdn.microsoft.com/en-us/library/cc246334(PROT.13).aspx
#define NO_SUBSTREAMS 0x2
#define NO_REPARSETAG 0x4
-/* Capabilities. see ftp.microsoft.com/developr/drg/cifs/cifs/cifs4.txt */
-
-#define CAP_RAW_MODE 0x0001
-#define CAP_MPX_MODE 0x0002
-#define CAP_UNICODE 0x0004
-#define CAP_LARGE_FILES 0x0008
-#define CAP_NT_SMBS 0x0010
-#define CAP_RPC_REMOTE_APIS 0x0020
-#define CAP_STATUS32 0x0040
-#define CAP_LEVEL_II_OPLOCKS 0x0080
-#define CAP_LOCK_AND_READ 0x0100
-#define CAP_NT_FIND 0x0200
-#define CAP_DFS 0x1000
-#define CAP_W2K_SMBS 0x2000
-#define CAP_LARGE_READX 0x4000
-#define CAP_LARGE_WRITEX 0x8000
-#define CAP_LWIO 0x10000
-#define CAP_UNIX 0x800000 /* Capabilities for UNIX extensions. Created by HP. */
-#define CAP_DYNAMIC_REAUTH 0x20000000
-#define CAP_EXTENDED_SECURITY 0x80000000
-
-#define SMB_CAP_BOTH_MASK ( \
- CAP_UNICODE | \
- CAP_NT_SMBS | \
- CAP_STATUS32 | \
- CAP_LEVEL_II_OPLOCKS | \
- CAP_EXTENDED_SECURITY | \
- 0)
-#define SMB_CAP_SERVER_MASK ( \
- CAP_RAW_MODE | \
- CAP_MPX_MODE | \
- CAP_LARGE_FILES | \
- CAP_RPC_REMOTE_APIS | \
- CAP_LOCK_AND_READ | \
- CAP_NT_FIND | \
- CAP_DFS | \
- CAP_W2K_SMBS | \
- CAP_LARGE_READX | \
- CAP_LARGE_WRITEX | \
- CAP_LWIO | \
- CAP_UNIX | \
- 0)
-#define SMB_CAP_CLIENT_MASK ( \
- CAP_DYNAMIC_REAUTH | \
- 0)
-
/* printing types */
enum printing_types {PRINT_BSD,PRINT_SYSV,PRINT_AIX,PRINT_HPUX,
PRINT_QNX,PRINT_PLP,PRINT_LPRNG,PRINT_SOFTQ,
diff --git a/source4/libcli/raw/smb.h b/source4/libcli/raw/smb.h
index 3178c898d6..81127830fe 100644
--- a/source4/libcli/raw/smb.h
+++ b/source4/libcli/raw/smb.h
@@ -449,24 +449,6 @@
#define NEGOTIATE_SECURITY_SIGNATURES_ENABLED 0x04
#define NEGOTIATE_SECURITY_SIGNATURES_REQUIRED 0x08
-/* CIFS protocol capabilities */
-#define CAP_RAW_MODE 0x00000001
-#define CAP_MPX_MODE 0x00000002
-#define CAP_UNICODE 0x00000004
-#define CAP_LARGE_FILES 0x00000008
-#define CAP_NT_SMBS 0x00000010
-#define CAP_RPC_REMOTE_APIS 0x00000020
-#define CAP_STATUS32 0x00000040
-#define CAP_LEVEL_II_OPLOCKS 0x00000080
-#define CAP_LOCK_AND_READ 0x00000100
-#define CAP_NT_FIND 0x00000200
-#define CAP_DFS 0x00001000
-#define CAP_W2K_SMBS 0x00002000
-#define CAP_LARGE_READX 0x00004000
-#define CAP_LARGE_WRITEX 0x00008000
-#define CAP_UNIX 0x00800000 /* Capabilities for UNIX extensions. Created by HP. */
-#define CAP_EXTENDED_SECURITY 0x80000000
-
/*
* Global value meaning that the smb_uid field should be
* ingored (in share level security and protocol level == CORE)