Changeset 745 for trunk/server/source4/libcli/raw/interfaces.h

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source4/libcli/raw/interfaces.h (modified) (17 diffs)

trunk/server/source4/libcli/raw/interfaces.h

@@ -186 +186 @@
                 struct {
                         const char *path;
-                        uint_t num_eas;
+                        unsigned int num_eas;
                         struct ea_struct *eas;                  
                 } in;
@@ -489 +489 @@
                         uint32_t attrib;
                         uint32_t ea_size;
-                        uint_t num_eas;
+                        unsigned int num_eas;
                         struct ea_struct {
                                 uint8_t flags;
@@ -517 +517 @@
                         uint32_t alignment_requirement;
                         uint32_t reparse_tag;
-                        uint_t num_streams;
+                        unsigned int num_streams;
                         struct stream_struct {
                                 uint64_t size;
@@ -579 +579 @@
                 struct {
                         union smb_handle_or_path file;
-                        uint_t num_names;
+                        unsigned int num_names;
                         struct ea_name {
                                 struct smb_wire_string name;
@@ -586 +586 @@
 
                 struct smb_ea_list {
-                        uint_t num_eas;
+                        unsigned int num_eas;
                         struct ea_struct *eas;
                 } out;
@@ -733 +733 @@
                 } in;
                 struct stream_information {
-                        uint_t num_streams;
+                        unsigned int num_streams;
                         struct stream_struct *streams;
                 } out;
@@ -994 +994 @@
                 struct {
                         union smb_handle_or_path file;
-                        uint_t num_eas;
+                        unsigned int num_eas;
                         struct ea_struct *eas;                  
                 } in;
@@ -1357 +1357 @@
         RAW_OPEN_NTTRANS_CREATE, 
         RAW_OPEN_OPENX_READX,
+        RAW_OPEN_NTCREATEX_READX,
         RAW_OPEN_SMB2
 };
@@ -1401 +1402 @@
                 file = &op->openxreadx.out.file; \
                 break; \
+        case RAW_OPEN_NTCREATEX_READX: \
+                file = &op->ntcreatexreadx.out.file; \
+                break; \
         case RAW_OPEN_SMB2: \
                 file = &op->smb2.out.file; \
@@ -1415 +1419 @@
                 struct {
                         uint32_t flags;
-                        uint32_t root_fid;
+                        union smb_handle root_fid;
                         uint32_t access_mask;
                         uint64_t alloc_size;
@@ -1436 +1440 @@
                         /* some optional parameters from the SMB2 varient */
                         bool query_maximal_access;
+
+                        /* private flags for internal use only */
+                        uint8_t private_flags;
                 } in;
                 struct {
@@ -1471 +1478 @@
                         uint32_t timeout;
                         const char *fname;
-                        uint_t num_eas;
+                        unsigned int num_eas;
                         struct ea_struct *eas;                  
                 } in;
@@ -1620 +1627 @@
         } openxreadx;
 
+        /* chained NTCreateX/ReadX interface */
+        struct {
+                enum smb_open_level level;
+                struct {
+                        uint32_t flags;
+                        union smb_handle root_fid;
+                        uint32_t access_mask;
+                        uint64_t alloc_size;
+                        uint32_t file_attr;
+                        uint32_t share_access;
+                        uint32_t open_disposition;
+                        uint32_t create_options;
+                        uint32_t impersonation;
+                        uint8_t  security_flags;
+                        /* NOTE: fname can also be a pointer to a
+                         uint64_t file_id if create_options has the
+                         NTCREATEX_OPTIONS_OPEN_BY_FILE_ID flag set */
+                        const char *fname;
+
+                        /* readx part */
+                        uint64_t offset;
+                        uint16_t mincnt;
+                        uint32_t maxcnt;
+                        uint16_t remaining;
+                } in;
+                struct {
+                        union smb_handle file;
+                        uint8_t oplock_level;
+                        uint32_t create_action;
+                        NTTIME create_time;
+                        NTTIME access_time;
+                        NTTIME write_time;
+                        NTTIME change_time;
+                        uint32_t attrib;
+                        uint64_t alloc_size;
+                        uint64_t size;
+                        uint16_t file_type;
+                        uint16_t ipc_state;
+                        uint8_t  is_directory;
+
+                        /* readx part */
+                        uint8_t *data;
+                        uint16_t remaining;
+                        uint16_t compaction_mode;
+                        uint16_t nread;
+                } out;
+        } ntcreatexreadx;
+
 #define SMB2_CREATE_FLAG_REQUEST_OPLOCK           0x0100
 #define SMB2_CREATE_FLAG_REQUEST_EXCLUSIVE_OPLOCK 0x0800
@@ -1979 +2034 @@
                         /* uint16_t buffer_code;  0x30 */
                         uint16_t lock_count;
-                        uint32_t reserved;
+                        uint32_t lock_sequence;
                         /* struct smb2_handle handle; */
                         struct smb2_lock_element {
@@ -2036 +2091 @@
                         union smb_handle file;
                         time_t write_time;
-#define SMB2_CLOSE_FLAGS_FULL_INFORMATION (1<<0)
                         uint16_t flags; /* SMB2_CLOSE_FLAGS_* */
                 } in;
@@ -2433 +2487 @@
 
                         /* the ea names are only used for RAW_SEARCH_EA_LIST */
-                        uint_t num_names;
+                        unsigned int num_names;
                         struct ea_name *ea_names;
                 } in;
@@ -2517 +2571 @@
 
                         /* the ea names are only used for RAW_SEARCH_EA_LIST */
-                        uint_t num_names;
+                        unsigned int num_names;
                         struct ea_name *ea_names;
                 } in;