libcli/smb Move FILE_ATTRIBUTE defines to the top level

diff --git a/libcli/smb/smb_constants.h b/libcli/smb/smb_constants.h
index 83e6388286ecfdfc14efe33544acd8954a87a945..59a6d9e388bd4e271f23c74109438a270fe49ca1 100644 (file)
--- a/libcli/smb/smb_constants.h
+++ b/libcli/smb/smb_constants.h
@@ -35,5 +35,28 @@
 #define FLAGS2_UNICODE_STRINGS         0x8000
 #define FLAGS2_WIN2K_SIGNATURE         0xC852 /* Hack alert ! For now... JRA. */
 
+/* FileAttributes (search attributes) field */
+#define FILE_ATTRIBUTE_READONLY                0x0001L
+#define FILE_ATTRIBUTE_HIDDEN          0x0002L
+#define FILE_ATTRIBUTE_SYSTEM          0x0004L
+#define FILE_ATTRIBUTE_VOLUME          0x0008L
+#define FILE_ATTRIBUTE_DIRECTORY       0x0010L
+#define FILE_ATTRIBUTE_ARCHIVE         0x0020L
+#define FILE_ATTRIBUTE_DEVICE          0x0040L
+#define FILE_ATTRIBUTE_NORMAL          0x0080L
+#define FILE_ATTRIBUTE_TEMPORARY       0x0100L
+#define FILE_ATTRIBUTE_SPARSE          0x0200L
+#define FILE_ATTRIBUTE_REPARSE_POINT   0x0400L
+#define FILE_ATTRIBUTE_COMPRESSED      0x0800L
+#define FILE_ATTRIBUTE_OFFLINE         0x1000L
+#define FILE_ATTRIBUTE_NONINDEXED      0x2000L
+#define FILE_ATTRIBUTE_ENCRYPTED       0x4000L
+#define FILE_ATTRIBUTE_ALL_MASK        0x7FFFL
+
+#define SAMBA_ATTRIBUTES_MASK          (FILE_ATTRIBUTE_READONLY|\
+                                       FILE_ATTRIBUTE_HIDDEN|\
+                                       FILE_ATTRIBUTE_SYSTEM|\
+                                       FILE_ATTRIBUTE_DIRECTORY|\
+                                       FILE_ATTRIBUTE_ARCHIVE)
 
 #endif /* _SMB_CONSTANTS_H */

diff --git a/source3/include/smb.h b/source3/include/smb.h
index 8ebde2f4adc132c4c6452626ca942d7725902a09..01866e2e8ac31611e67aad70d40e9641f86c54f4 100644 (file)
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -1084,26 +1084,6 @@ struct bitmap {
 #define FILE_SHARE_WRITE 2
 #define FILE_SHARE_DELETE 4
 
-/* FileAttributesField */
-#define FILE_ATTRIBUTE_READONLY                0x001L
-#define FILE_ATTRIBUTE_HIDDEN          0x002L
-#define FILE_ATTRIBUTE_SYSTEM          0x004L
-#define FILE_ATTRIBUTE_DIRECTORY       0x010L
-#define FILE_ATTRIBUTE_ARCHIVE         0x020L
-#define FILE_ATTRIBUTE_NORMAL          0x080L
-#define FILE_ATTRIBUTE_TEMPORARY       0x100L
-#define FILE_ATTRIBUTE_SPARSE          0x200L
-#define FILE_ATTRIBUTE_REPARSE_POINT    0x400L
-#define FILE_ATTRIBUTE_COMPRESSED      0x800L
-#define FILE_ATTRIBUTE_OFFLINE          0x1000L
-#define FILE_ATTRIBUTE_NONINDEXED      0x2000L
-#define FILE_ATTRIBUTE_ENCRYPTED        0x4000L
-#define SAMBA_ATTRIBUTES_MASK          (FILE_ATTRIBUTE_READONLY|\
-                                       FILE_ATTRIBUTE_HIDDEN|\
-                                       FILE_ATTRIBUTE_SYSTEM|\
-                                       FILE_ATTRIBUTE_DIRECTORY|\
-                                       FILE_ATTRIBUTE_ARCHIVE)
-
 /* Flags - combined with attributes. */
 #define FILE_FLAG_WRITE_THROUGH    0x80000000L
 #define FILE_FLAG_NO_BUFFERING     0x20000000L

diff --git a/source4/libcli/raw/smb.h b/source4/libcli/raw/smb.h
index 05bf91fe3bbf1b4fc38997cd4aa2ee4136fb5186..c3fdbbba23e7df7b1710d563722a40f5fdb1662c 100644 (file)
--- a/source4/libcli/raw/smb.h
+++ b/source4/libcli/raw/smb.h
@@ -366,24 +366,6 @@
 #define DESIRED_ACCESS_PIPE 0x2019f
  
 
-/* FileAttributes (search attributes) field */
-#define FILE_ATTRIBUTE_READONLY                0x0001
-#define FILE_ATTRIBUTE_HIDDEN          0x0002
-#define FILE_ATTRIBUTE_SYSTEM          0x0004
-#define FILE_ATTRIBUTE_VOLUME          0x0008
-#define FILE_ATTRIBUTE_DIRECTORY       0x0010
-#define FILE_ATTRIBUTE_ARCHIVE         0x0020
-#define FILE_ATTRIBUTE_DEVICE          0x0040
-#define FILE_ATTRIBUTE_NORMAL          0x0080
-#define FILE_ATTRIBUTE_TEMPORARY       0x0100
-#define FILE_ATTRIBUTE_SPARSE          0x0200
-#define FILE_ATTRIBUTE_REPARSE_POINT   0x0400
-#define FILE_ATTRIBUTE_COMPRESSED      0x0800
-#define FILE_ATTRIBUTE_OFFLINE         0x1000
-#define FILE_ATTRIBUTE_NONINDEXED      0x2000
-#define FILE_ATTRIBUTE_ENCRYPTED       0x4000
-#define FILE_ATTRIBUTE_ALL_MASK        0x7FFF
-
 /* Flags - combined with attributes. */
 #define FILE_FLAG_WRITE_THROUGH    0x80000000L
 #define FILE_FLAG_NO_BUFFERING     0x20000000L