Changeset 988 for vendor/current/source3/include/MacExtensions.h

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

File:

• vendor/current/source3/include/MacExtensions.h (modified) (3 diffs)

vendor/current/source3/include/MacExtensions.h

@@ -31 +31 @@
 #define DefaultStreamTest               ":$DATA"
 #define AFPDATA_STREAM                  "::$DATA"
-#define AFPINFO_STREAM                  ":AFP_AfpInfo:$DATA"
-#define AFPRESOURCE_STREAM              ":AFP_Resource:$DATA"
-#define AFPCOMMENTS_STREAM              ":Comments:$DATA"
-#define AFPDESKTOP_STREAM               ":AFP_DeskTop:$DATA"
-#define AFPIDINDEX_STREAM               ":AFP_IdIndex:$DATA"
+
+#define AFPINFO_STREAM_NAME             ":AFP_AfpInfo"
+#define AFPRESOURCE_STREAM_NAME         ":AFP_Resource"
+#define AFPCOMMENTS_STREAM_NAME         ":Comments"
+#define AFPDESKTOP_STREAM_NAME          ":AFP_DeskTop"
+#define AFPIDINDEX_STREAM_NAME          ":AFP_IdIndex"
+
+#define AFPINFO_STREAM                  AFPINFO_STREAM_NAME ":$DATA"
+#define AFPRESOURCE_STREAM              AFPRESOURCE_STREAM_NAME ":$DATA"
+#define AFPCOMMENTS_STREAM              AFPCOMMENTS_STREAM_NAME ":$DATA"
+#define AFPDESKTOP_STREAM               AFPDESKTOP_STREAM_NAME ":$DATA"
+#define AFPIDINDEX_STREAM               AFPIDINDEX_STREAM_NAME ":$DATA"
 
 /*
 ** NT's AFP_AfpInfo stream structure
 */
-#define APF_INFO_SIZE           0x3c            
+#define AFP_INFO_SIZE           0x3c
 #define AFP_Signature           0x41465000 
 #define AFP_Version                     0x00000100
-#define AFP_BackupTime          0x00000080
+#define AFP_BackupTime          0x80000000
 #define AFP_FinderSize          32
 /*
@@ -53 +60 @@
 typedef struct _AfpInfo
 {
-         uint32         afpi_Signature;                 /* Must be *(PDWORD)"AFP" */
-         uint32         afpi_Version;                   /* Must be 0x00010000 */
-         uint32         afpi_Reserved1;
-         uint32         afpi_BackupTime;                /* Backup time for the file/dir */
+         uint32_t       afpi_Signature;                 /* Must be *(PDWORD)"AFP" */
+         uint32_t       afpi_Version;                   /* Must be 0x00010000 */
+         uint32_t       afpi_Reserved1;
+         uint32_t       afpi_BackupTime;                /* Backup time for the file/dir */
          unsigned char  afpi_FinderInfo[AFP_FinderSize];        /* Finder Info (32 bytes) */
          unsigned char  afpi_ProDosInfo[6];     /* ProDos Info (6 bytes) # */
@@ -74 +81 @@
 
 /*
-** These extentions are only supported with the NT LM 0.12 Dialect. These extentions
+** These extensions are only supported with the NT LM 0.12 Dialect. These extentions
 ** will be process on a share by share bases.
 */
 
 /*
-** Trans2_Query_FS_Information Call is used by the MacCIFS extentions for three reasons.
-** First to see if the remote server share supports the basic Macintosh CIFS extentions.
+** Trans2_Query_FS_Information Call is used by the MacCIFS extensions for three reasons.
+** First to see if the remote server share supports the basic Macintosh CIFS extensions.
 ** Second to return some basic need information about the share to the Macintosh.
-** Third to see if this share support any other Macintosh extentions.
+** Third to see if this share support any other Macintosh extensions.
 **
 ** We will be using infromation levels that are betwwen 0x300 and 0x399 for all Macintosh
-** extentions calls. The first of these will be the SMB_MAC_QUERY_FS_INFO level which
+** extensions calls. The first of these will be the SMB_MAC_QUERY_FS_INFO level which
 ** will allow the server to return the MacQueryFSInfo structure. All fields are Little
 ** Endian unless other wise specified.