From 7891848357a945581d6c94909b2d783c75afe46e Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 6 Jul 2011 13:06:14 +1000 Subject: libcli/smb move FILE_TYPE constants in common This allows us to remove another _SAMBA_BUILD_ conditional Andrew Bartlett --- libcli/named_pipe_auth/npa_tstream.c | 4 +--- libcli/smb/smb_constants.h | 8 ++++++++ 2 files changed, 9 insertions(+), 3 deletions(-) (limited to 'libcli') diff --git a/libcli/named_pipe_auth/npa_tstream.c b/libcli/named_pipe_auth/npa_tstream.c index 2aeea5b0d3..c2eb7bf714 100644 --- a/libcli/named_pipe_auth/npa_tstream.c +++ b/libcli/named_pipe_auth/npa_tstream.c @@ -24,9 +24,7 @@ #include "../lib/tsocket/tsocket_internal.h" #include "../librpc/gen_ndr/ndr_named_pipe_auth.h" #include "../libcli/named_pipe_auth/npa_tstream.h" -#if _SAMBA_BUILD_ == 4 -#include "libcli/raw/smb.h" -#endif +#include "../libcli/smb/smb_constants.h" static const struct tstream_context_ops tstream_npa_ops; diff --git a/libcli/smb/smb_constants.h b/libcli/smb/smb_constants.h index 33a2a8d5b7..ed7f6ffd1e 100644 --- a/libcli/smb/smb_constants.h +++ b/libcli/smb/smb_constants.h @@ -71,4 +71,12 @@ enum protocol_types { FILE_ATTRIBUTE_DIRECTORY|\ FILE_ATTRIBUTE_ARCHIVE) +/* File type flags */ +#define FILE_TYPE_DISK 0 +#define FILE_TYPE_BYTE_MODE_PIPE 1 +#define FILE_TYPE_MESSAGE_MODE_PIPE 2 +#define FILE_TYPE_PRINTER 3 +#define FILE_TYPE_COMM_DEVICE 4 +#define FILE_TYPE_UNKNOWN 0xFFFF + #endif /* _SMB_CONSTANTS_H */ -- cgit