diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-07-06 13:05:45 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-07-06 05:32:51 +0200 |
| commit | 6543987139197800a3e93b768133474ed0c2d0dc (patch) | |
| tree | 7f8746634cd61b37beb726eb0650754b3d9f7f64 | |
| parent | 68e0b262be33a1e25018a2afa1e1280ecc5a96eb (diff) | |
| download | samba-6543987139197800a3e93b768133474ed0c2d0dc.tar.gz samba-6543987139197800a3e93b768133474ed0c2d0dc.tar.bz2 samba-6543987139197800a3e93b768133474ed0c2d0dc.zip | |
libcli/smb move enum protocol_types to a common header
| -rw-r--r-- | lib/util/ms_fnmatch.c | 1 | ||||
| -rw-r--r-- | lib/util/util.h | 15 | ||||
| -rw-r--r-- | libcli/smb/smb_constants.h | 12 | ||||
| -rw-r--r-- | source3/include/smb.h | 12 | ||||
| -rw-r--r-- | source4/libcli/raw/libcliraw.h | 1 |
5 files changed, 14 insertions, 27 deletions
diff --git a/lib/util/ms_fnmatch.c b/lib/util/ms_fnmatch.c index 1ba5888ca0..ede9eff78f 100644 --- a/lib/util/ms_fnmatch.c +++ b/lib/util/ms_fnmatch.c @@ -29,6 +29,7 @@ */ #include "includes.h" +#include "libcli/smb/smb_constants.h" static int null_match(const char *p) { diff --git a/lib/util/util.h b/lib/util/util.h index c715440186..b9734b07c8 100644 --- a/lib/util/util.h +++ b/lib/util/util.h @@ -762,21 +762,6 @@ _PUBLIC_ int sys_fsusage(const char *path, uint64_t *dfree, uint64_t *dsize); * @brief MS-style Filename matching */ -#if _SAMBA_BUILD_ == 4 -/* protocol types. It assumes that higher protocols include lower protocols - as subsets. FIXME: Move to one of the smb-specific headers */ -enum protocol_types { - PROTOCOL_NONE, - PROTOCOL_CORE, - PROTOCOL_COREPLUS, - PROTOCOL_LANMAN1, - PROTOCOL_LANMAN2, - PROTOCOL_NT1, - PROTOCOL_SMB2 -}; - -#endif - int ms_fnmatch_protocol(const char *pattern, const char *string, int protocol); /** a generic fnmatch function - uses for non-CIFS pattern matching */ diff --git a/libcli/smb/smb_constants.h b/libcli/smb/smb_constants.h index 59a6d9e388..33a2a8d5b7 100644 --- a/libcli/smb/smb_constants.h +++ b/libcli/smb/smb_constants.h @@ -22,6 +22,18 @@ #ifndef _SMB_CONSTANTS_H #define _SMB_CONSTANTS_H +/* protocol types. It assumes that higher protocols include lower protocols + as subsets. */ +enum protocol_types { + PROTOCOL_NONE, + PROTOCOL_CORE, + PROTOCOL_COREPLUS, + PROTOCOL_LANMAN1, + PROTOCOL_LANMAN2, + PROTOCOL_NT1, + PROTOCOL_SMB2 +}; + /* 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 4319a1056d..36f1912b55 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -1229,18 +1229,6 @@ http://msdn.microsoft.com/en-us/library/cc246334(PROT.13).aspx #define CAP_UNIX 0x800000 /* Capabilities for UNIX extensions. Created by HP. */ #define CAP_EXTENDED_SECURITY 0x80000000 -/* protocol types. It assumes that higher protocols include lower protocols - as subsets */ -enum protocol_types { - PROTOCOL_NONE, - PROTOCOL_CORE, - PROTOCOL_COREPLUS, - PROTOCOL_LANMAN1, - PROTOCOL_LANMAN2, - PROTOCOL_NT1, - PROTOCOL_SMB2 -}; - /* 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/libcliraw.h b/source4/libcli/raw/libcliraw.h index 40813f3729..cb8e81c1bc 100644 --- a/source4/libcli/raw/libcliraw.h +++ b/source4/libcli/raw/libcliraw.h @@ -22,6 +22,7 @@ #ifndef __LIBCLI_RAW_H__ #define __LIBCLI_RAW_H__ +#include "libcli/smb/smb_common.h" #include "libcli/raw/request.h" #include "librpc/gen_ndr/nbt.h" |