diff options
| -rw-r--r-- | lib/util/charset/charcnv.c | 1 | ||||
| -rw-r--r-- | libcli/smb/smb_common.h | 1 | ||||
| -rw-r--r-- | libcli/smb/smb_constants.h | 39 | ||||
| -rw-r--r-- | source3/include/smb.h | 17 | ||||
| -rw-r--r-- | source4/libcli/raw/smb.h | 13 |
5 files changed, 44 insertions, 27 deletions
diff --git a/lib/util/charset/charcnv.c b/lib/util/charset/charcnv.c index 1e1f2a350e..5489cf7391 100644 --- a/lib/util/charset/charcnv.c +++ b/lib/util/charset/charcnv.c @@ -22,6 +22,7 @@ */ #include "includes.h" #include "system/iconv.h" +#include "libcli/smb/smb_common.h" /** * @file diff --git a/libcli/smb/smb_common.h b/libcli/smb/smb_common.h index d6186ab526..8fe0623727 100644 --- a/libcli/smb/smb_common.h +++ b/libcli/smb/smb_common.h @@ -24,5 +24,6 @@ #include "../libcli/smb/smb2_constants.h" #include "../libcli/smb/smb2_create_blob.h" +#include "../libcli/smb/smb_constants.h" #endif diff --git a/libcli/smb/smb_constants.h b/libcli/smb/smb_constants.h new file mode 100644 index 0000000000..83e6388286 --- /dev/null +++ b/libcli/smb/smb_constants.h @@ -0,0 +1,39 @@ +/* + Unix SMB/CIFS implementation. + + SMB parameters and setup, plus a whole lot more. + + Copyright (C) Andrew Tridgell 2011 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. +*/ + +#ifndef _SMB_CONSTANTS_H +#define _SMB_CONSTANTS_H + +/* NT Flags2 bits - cifs6.txt section 3.1.2 */ +#define FLAGS2_LONG_PATH_COMPONENTS 0x0001 +#define FLAGS2_EXTENDED_ATTRIBUTES 0x0002 +#define FLAGS2_SMB_SECURITY_SIGNATURES 0x0004 +#define FLAGS2_UNKNOWN_BIT4 0x0010 +#define FLAGS2_IS_LONG_NAME 0x0040 +#define FLAGS2_EXTENDED_SECURITY 0x0800 +#define FLAGS2_DFS_PATHNAMES 0x1000 +#define FLAGS2_READ_PERMIT_EXECUTE 0x2000 +#define FLAGS2_32_BIT_ERROR_CODES 0x4000 +#define FLAGS2_UNICODE_STRINGS 0x8000 +#define FLAGS2_WIN2K_SIGNATURE 0xC852 /* Hack alert ! For now... JRA. */ + + +#endif /* _SMB_CONSTANTS_H */ diff --git a/source3/include/smb.h b/source3/include/smb.h index 882b23471b..f62da84a4f 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -26,6 +26,8 @@ #ifndef _SMB_H #define _SMB_H +#include "libcli/smb/smb_common.h" + /* logged when starting the various Samba daemons */ #define COPYRIGHT_STARTUP_MESSAGE "Copyright Andrew Tridgell and the Samba Team 1992-2011" @@ -1348,21 +1350,6 @@ char *strdup(char *s); #define NEGOTIATE_SECURITY_SIGNATURES_ENABLED 0x04 #define NEGOTIATE_SECURITY_SIGNATURES_REQUIRED 0x08 -/* NT Flags2 bits - cifs6.txt section 3.1.2 */ - -#define FLAGS2_LONG_PATH_COMPONENTS 0x0001 -#define FLAGS2_EXTENDED_ATTRIBUTES 0x0002 -#define FLAGS2_SMB_SECURITY_SIGNATURES 0x0004 -#define FLAGS2_UNKNOWN_BIT4 0x0010 -#define FLAGS2_IS_LONG_NAME 0x0040 -#define FLAGS2_EXTENDED_SECURITY 0x0800 -#define FLAGS2_DFS_PATHNAMES 0x1000 -#define FLAGS2_READ_PERMIT_EXECUTE 0x2000 -#define FLAGS2_32_BIT_ERROR_CODES 0x4000 -#define FLAGS2_UNICODE_STRINGS 0x8000 - -#define FLAGS2_WIN2K_SIGNATURE 0xC852 /* Hack alert ! For now... JRA. */ - /* TCONX Flag (smb_vwv2). */ #define TCONX_FLAG_EXTENDED_RESPONSE 0x8 diff --git a/source4/libcli/raw/smb.h b/source4/libcli/raw/smb.h index d93ad0d005..05bf91fe3b 100644 --- a/source4/libcli/raw/smb.h +++ b/source4/libcli/raw/smb.h @@ -504,18 +504,6 @@ #define NEGOTIATE_SECURITY_SIGNATURES_ENABLED 0x04 #define NEGOTIATE_SECURITY_SIGNATURES_REQUIRED 0x08 -/* NT Flags2 bits - cifs6.txt section 3.1.2 */ -#define FLAGS2_LONG_PATH_COMPONENTS 0x0001 -#define FLAGS2_EXTENDED_ATTRIBUTES 0x0002 -#define FLAGS2_SMB_SECURITY_SIGNATURES 0x0004 -#define FLAGS2_IS_LONG_NAME 0x0040 -#define FLAGS2_EXTENDED_SECURITY 0x0800 -#define FLAGS2_DFS_PATHNAMES 0x1000 -#define FLAGS2_READ_PERMIT_EXECUTE 0x2000 -#define FLAGS2_32_BIT_ERROR_CODES 0x4000 -#define FLAGS2_UNICODE_STRINGS 0x8000 - - /* CIFS protocol capabilities */ #define CAP_RAW_MODE 0x00000001 #define CAP_MPX_MODE 0x00000002 @@ -610,5 +598,6 @@ #include "libcli/raw/trans2.h" #include "libcli/raw/interfaces.h" +#include "libcli/smb/smb_common.h" #endif /* _SMB_H */ |