diff options
| author | Stefan Metzmacher <metze@samba.org> | 2012-08-01 11:33:27 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2012-08-01 14:17:16 +0200 |
| commit | d3aaa1ebc822d3384f1821302585921d44028649 (patch) | |
| tree | 396101dcaf9d199e4401869ef5e369e1438584f5 | |
| parent | 8e1c6d42327faae5df6e384cf9573bf4dc925038 (diff) | |
| download | samba-d3aaa1ebc822d3384f1821302585921d44028649.tar.gz samba-d3aaa1ebc822d3384f1821302585921d44028649.tar.bz2 samba-d3aaa1ebc822d3384f1821302585921d44028649.zip | |
libcli/smb: move some TCON related defines to smb_constants.h
metze
| -rw-r--r-- | libcli/smb/smb_constants.h | 13 | ||||
| -rw-r--r-- | source3/include/smb.h | 9 | ||||
| -rw-r--r-- | source4/libcli/raw/smb.h | 4 |
3 files changed, 13 insertions, 13 deletions
diff --git a/libcli/smb/smb_constants.h b/libcli/smb/smb_constants.h index aaf87c1a4b..8cb3b6e421 100644 --- a/libcli/smb/smb_constants.h +++ b/libcli/smb/smb_constants.h @@ -262,6 +262,19 @@ enum csc_policy { CSC_POLICY_DISABLE=3 }; +/* TCONX Flag (smb_vwv2). [MS-SMB] 2.2.4.7.1 */ +#define TCONX_FLAG_DISCONNECT_TID 0x0001 +#define TCONX_FLAG_EXTENDED_SIGNATURES 0x0004 +#define TCONX_FLAG_EXTENDED_RESPONSE 0x0008 + +/* this is used on a TConX. [MS-SMB] 2.2.4.7.2 */ +#define SMB_SUPPORT_SEARCH_BITS 0x0001 +#define SMB_SHARE_IN_DFS 0x0002 +#define SMB_CSC_MASK 0x000C +#define SMB_CSC_POLICY_SHIFT 2 +#define SMB_UNIQUE_FILE_NAME 0x0010 +#define SMB_EXTENDED_SIGNATURES 0x0020 + /* NT Flags2 bits - cifs6.txt section 3.1.2 */ #define FLAGS2_LONG_PATH_COMPONENTS 0x0001 #define FLAGS2_EXTENDED_ATTRIBUTES 0x0002 diff --git a/source3/include/smb.h b/source3/include/smb.h index 310cbbb7be..c6e6fb3871 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -399,10 +399,6 @@ Offset Data length. #define smb_ntcreate_ImpersonationLevel (smb_vwv0 + 43) #define smb_ntcreate_SecurityFlags (smb_vwv0 + 47) -/* this is used on a TConX. I'm not sure the name is very helpful though */ -#define SMB_SUPPORT_SEARCH_BITS 0x0001 -#define SMB_SHARE_IN_DFS 0x0002 - /* Named pipe write mode flags. Used in writeX calls. */ #define PIPE_RAW_MODE 0x4 #define PIPE_START_MESSAGE 0x8 @@ -621,11 +617,6 @@ char *strdup(char *s); #define BROWSER_ELECTION_VERSION 0x010f #define BROWSER_CONSTANT 0xaa55 -/* TCONX Flag (smb_vwv2). */ -#define TCONX_FLAG_EXTENDED_RESPONSE 0x8 -#define TCONX_FLAG_EXTENDED_SIGNATURES 0x4 -#define SMB_EXTENDED_SIGNATURES 0x20 - /* File Status Flags. See: http://msdn.microsoft.com/en-us/library/cc246334(PROT.13).aspx diff --git a/source4/libcli/raw/smb.h b/source4/libcli/raw/smb.h index be1bfdb7d1..279ada1817 100644 --- a/source4/libcli/raw/smb.h +++ b/source4/libcli/raw/smb.h @@ -219,10 +219,6 @@ #define NT_TRANSACT_RENAME 5 #define NT_TRANSACT_QUERY_SECURITY_DESC 6 -/* this is used on a TConX. I'm not sure the name is very helpful though */ -#define SMB_SUPPORT_SEARCH_BITS 0x0001 -#define SMB_SHARE_IN_DFS 0x0002 - /* Named pipe write mode flags. Used in writeX calls. */ #define PIPE_RAW_MODE 0x4 #define PIPE_START_MESSAGE 0x8 |