summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-07-06 13:05:45 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-07-06 05:32:51 +0200
commit6543987139197800a3e93b768133474ed0c2d0dc (patch)
tree7f8746634cd61b37beb726eb0650754b3d9f7f64 /lib
parent68e0b262be33a1e25018a2afa1e1280ecc5a96eb (diff)
downloadsamba-6543987139197800a3e93b768133474ed0c2d0dc.tar.gz
samba-6543987139197800a3e93b768133474ed0c2d0dc.tar.bz2
samba-6543987139197800a3e93b768133474ed0c2d0dc.zip
libcli/smb move enum protocol_types to a common header
Diffstat (limited to 'lib')
-rw-r--r--lib/util/ms_fnmatch.c1
-rw-r--r--lib/util/util.h15
2 files changed, 1 insertions, 15 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 */