From ceb26257dd02dc5d4aad06be01e913feade35dac Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 23 Sep 2014 14:05:43 -0700 Subject: [PATCH] lib/util: Do not duplicate the protocol list, use smb_constants.h This avoids the two lists getting out of sync, and only applies to a Samba build due to the surrounding #ifdef Andrew Bartlett Signed-off-by: Andrew Bartlett Reviewed-by: Stefan Metzmacher --- ctdb/lib/util/util.h | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/ctdb/lib/util/util.h b/ctdb/lib/util/util.h index 33f46bd3d59..c7734d18474 100644 --- a/ctdb/lib/util/util.h +++ b/ctdb/lib/util/util.h @@ -485,17 +485,7 @@ _PUBLIC_ int sys_fsusage(const char *path, uint64_t *dfree, uint64_t *dsize); */ #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 -}; +#include "libcli/smb/smb_constants.h" int ms_fnmatch(const char *pattern, const char *string, enum protocol_types protocol); -- 2.34.1