Changeset 736 for branches/samba-3.5.x/source3/libsmb/clireadwrite.c

Timestamp:

Nov 12, 2012, 5:38:52 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: update branche to 3.5.16

File:

• branches/samba-3.5.x/source3/libsmb/clireadwrite.c (modified) (2 diffs)

branches/samba-3.5.x/source3/libsmb/clireadwrite.c

@@ -89 +89 @@
         struct tevent_req *req, *subreq;
         struct cli_read_andx_state *state;
-        bool bigoffset = False;
         uint8_t wct = 10;
 
@@ -116 +115 @@
         SSVAL(state->vwv + 9, 0, 0);
 
-        if ((uint64_t)offset >> 32) {
-                bigoffset = true;
+        if (cli->capabilities & CAP_LARGE_FILES) {
                 SIVAL(state->vwv + 10, 0,
                       (((uint64_t)offset)>>32) & 0xffffffff);
-                wct += 2;
+                wct = 12;
+        } else {
+                if ((((uint64_t)offset) & 0xffffffff00000000LL) != 0) {
+                        DEBUG(10, ("cli_read_andx_send got large offset where "
+                                   "the server does not support it\n"));
+                        tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);
+                        return tevent_req_post(req, ev);
+                }
         }