libcli/smb move FILE_TYPE constants in common

This allows us to remove another _SAMBA_BUILD_ conditional

Andrew Bartlett

diff --git a/libcli/named_pipe_auth/npa_tstream.c b/libcli/named_pipe_auth/npa_tstream.c
index 2aeea5b0d363b81997282af9996e0e94ab23a9a3..c2eb7bf7148d73f14992e9dcd0ad46f2d5bd3abf 100644 (file)
--- 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 33a2a8d5b7062a74c8f0b75b3e58766df61b9f25..ed7f6ffd1e690ac26146462ebd2a051047a1fcd7 100644 (file)
--- 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 */

diff --git a/source3/include/smb.h b/source3/include/smb.h
index 36f1912b5592984da69c5d884f45b5e323e89f34..d41d36342d01fa33a56d2816868633d49ac39463 100644 (file)
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -1085,14 +1085,6 @@ struct bitmap {
 #define FILE_WAS_CREATED 2
 #define FILE_WAS_OVERWRITTEN 3
 
-/* 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
-
 /* Flag for NT transact rename call. */
 #define RENAME_REPLACE_IF_EXISTS 1
 

diff --git a/source4/libcli/raw/smb.h b/source4/libcli/raw/smb.h
index 008ab57c0de4d1eeca8040982b88a9b927743c09..c1658406c485beb67eb39a00fd28c15624440601 100644 (file)
--- a/source4/libcli/raw/smb.h
+++ b/source4/libcli/raw/smb.h
@@ -381,14 +381,6 @@
 #define FILE_WAS_CREATED 2
 #define FILE_WAS_OVERWRITTEN 3
 
-/* 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
-
 /* Flag for NT transact rename call. */
 #define RENAME_REPLACE_IF_EXISTS 1