Changeset 745 for trunk/server/source4/libcli/raw/rawfile.c

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/rawfile.c (modified) (6 diffs)

trunk/server/source4/libcli/raw/rawfile.c

@@ -349 +349 @@
         if (parms->ntcreatex.in.sec_desc) {
                 enum ndr_err_code ndr_err;
-                ndr_err = ndr_push_struct_blob(&sd_blob, mem_ctx, NULL,
+                ndr_err = ndr_push_struct_blob(&sd_blob, mem_ctx, 
                                                parms->ntcreatex.in.sec_desc,
                                                (ndr_push_flags_fn_t)ndr_push_security_descriptor);
@@ -380 +380 @@
 
         SIVAL(params,  0, parms->ntcreatex.in.flags);
-        SIVAL(params,  4, parms->ntcreatex.in.root_fid);
+        SIVAL(params,  4, parms->ntcreatex.in.root_fid.fnum);
         SIVAL(params,  8, parms->ntcreatex.in.access_mask);
         SBVAL(params, 12, parms->ntcreatex.in.alloc_size);
@@ -565 +565 @@
                 SCVAL(req->out.vwv, VWV(2),0); /* padding */
                 SIVAL(req->out.vwv,  7, parms->ntcreatex.in.flags);
-                SIVAL(req->out.vwv, 11, parms->ntcreatex.in.root_fid);
+                SIVAL(req->out.vwv, 11, parms->ntcreatex.in.root_fid.fnum);
                 SIVAL(req->out.vwv, 15, parms->ntcreatex.in.access_mask);
                 SBVAL(req->out.vwv, 19, parms->ntcreatex.in.alloc_size);
@@ -617 +617 @@
                 }
                 break;
+
+        case RAW_OPEN_NTCREATEX_READX:
+                SETUP_REQUEST(SMBntcreateX, 24, 0);
+                SSVAL(req->out.vwv, VWV(0),SMB_CHAIN_NONE);
+                SSVAL(req->out.vwv, VWV(1),0);
+                SCVAL(req->out.vwv, VWV(2),0); /* padding */
+                SIVAL(req->out.vwv,  7, parms->ntcreatexreadx.in.flags);
+                SIVAL(req->out.vwv, 11, parms->ntcreatexreadx.in.root_fid.fnum);
+                SIVAL(req->out.vwv, 15, parms->ntcreatexreadx.in.access_mask);
+                SBVAL(req->out.vwv, 19, parms->ntcreatexreadx.in.alloc_size);
+                SIVAL(req->out.vwv, 27, parms->ntcreatexreadx.in.file_attr);
+                SIVAL(req->out.vwv, 31, parms->ntcreatexreadx.in.share_access);
+                SIVAL(req->out.vwv, 35, parms->ntcreatexreadx.in.open_disposition);
+                SIVAL(req->out.vwv, 39, parms->ntcreatexreadx.in.create_options);
+                SIVAL(req->out.vwv, 43, parms->ntcreatexreadx.in.impersonation);
+                SCVAL(req->out.vwv, 47, parms->ntcreatexreadx.in.security_flags);
+
+                smbcli_req_append_string_len(req, parms->ntcreatexreadx.in.fname, STR_TERMINATE, &len);
+                SSVAL(req->out.vwv, 5, len);
+
+                if (tree->session->transport->negotiate.capabilities & CAP_LARGE_FILES) {
+                        bigoffset = true;
+                }
+
+                smbcli_chained_request_setup(req, SMBreadX, bigoffset ? 12 : 10, 0);
+
+                SSVAL(req->out.vwv, VWV(0), SMB_CHAIN_NONE);
+                SSVAL(req->out.vwv, VWV(1), 0);
+                SSVAL(req->out.vwv, VWV(2), 0);
+                SIVAL(req->out.vwv, VWV(3), parms->ntcreatexreadx.in.offset);
+                SSVAL(req->out.vwv, VWV(5), parms->ntcreatexreadx.in.maxcnt & 0xFFFF);
+                SSVAL(req->out.vwv, VWV(6), parms->ntcreatexreadx.in.mincnt);
+                SIVAL(req->out.vwv, VWV(7), parms->ntcreatexreadx.in.maxcnt >> 16);
+                SSVAL(req->out.vwv, VWV(9), parms->ntcreatexreadx.in.remaining);
+                if (bigoffset) {
+                        SIVAL(req->out.vwv, VWV(10),parms->ntcreatexreadx.in.offset>>32);
+                }
+                break;
+
         case RAW_OPEN_SMB2:
                 return NULL;
@@ -754 +793 @@
                 }
                 break;
+
+        case RAW_OPEN_NTCREATEX_READX:
+                SMBCLI_CHECK_MIN_WCT(req, 34);
+                parms->ntcreatexreadx.out.oplock_level =              CVAL(req->in.vwv, 4);
+                parms->ntcreatexreadx.out.file.fnum =                 SVAL(req->in.vwv, 5);
+                parms->ntcreatexreadx.out.create_action =             IVAL(req->in.vwv, 7);
+                parms->ntcreatexreadx.out.create_time =   smbcli_pull_nttime(req->in.vwv, 11);
+                parms->ntcreatexreadx.out.access_time =   smbcli_pull_nttime(req->in.vwv, 19);
+                parms->ntcreatexreadx.out.write_time =    smbcli_pull_nttime(req->in.vwv, 27);
+                parms->ntcreatexreadx.out.change_time =   smbcli_pull_nttime(req->in.vwv, 35);
+                parms->ntcreatexreadx.out.attrib =                   IVAL(req->in.vwv, 43);
+                parms->ntcreatexreadx.out.alloc_size =               BVAL(req->in.vwv, 47);
+                parms->ntcreatexreadx.out.size =                     BVAL(req->in.vwv, 55);
+                parms->ntcreatexreadx.out.file_type =                SVAL(req->in.vwv, 63);
+                parms->ntcreatexreadx.out.ipc_state =                SVAL(req->in.vwv, 65);
+                parms->ntcreatexreadx.out.is_directory =             CVAL(req->in.vwv, 67);
+
+                status = smbcli_chained_advance(req);
+                if (!NT_STATUS_IS_OK(status)) {
+                        return status;
+                }
+
+                SMBCLI_CHECK_WCT(req, 12);
+                parms->ntcreatexreadx.out.remaining       = SVAL(req->in.vwv, VWV(2));
+                parms->ntcreatexreadx.out.compaction_mode = SVAL(req->in.vwv, VWV(3));
+                parms->ntcreatexreadx.out.nread = SVAL(req->in.vwv, VWV(5));
+                if (parms->ntcreatexreadx.out.nread >
+                    MAX(parms->ntcreatexreadx.in.mincnt, parms->ntcreatexreadx.in.maxcnt) ||
+                    !smbcli_raw_pull_data(&req->in.bufinfo, req->in.hdr + SVAL(req->in.vwv, VWV(6)),
+                                          parms->ntcreatexreadx.out.nread,
+                                          parms->ntcreatexreadx.out.data)) {
+                        req->status = NT_STATUS_BUFFER_TOO_SMALL;
+                }
+                break;
+
         case RAW_OPEN_SMB2:
                 req->status = NT_STATUS_INTERNAL_ERROR;
@@ -845 +919 @@
         case RAW_LOCK_LOCKX: {
                 struct smb_lock_entry *lockp;
-                uint_t lck_size = (parms->lockx.in.mode & LOCKING_ANDX_LARGE_FILES)? 20 : 10;
-                uint_t lock_count = parms->lockx.in.ulock_cnt + parms->lockx.in.lock_cnt;
+                unsigned int lck_size = (parms->lockx.in.mode & LOCKING_ANDX_LARGE_FILES)? 20 : 10;
+                unsigned int lock_count = parms->lockx.in.ulock_cnt + parms->lockx.in.lock_cnt;
                 int i;