Changeset 733 for branches/samba-3.5.x/source3/libsmb

Timestamp:

Nov 12, 2012, 5:09:31 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: update branche to 3.5.13

Location:

branches/samba-3.5.x/source3/libsmb

Files:

• clikrb5.c (modified) (1 diff)
• clireadwrite.c (modified) (5 diffs)

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

@@ -2089 +2089 @@
         }
 
-        ret = krb5_cc_store_cred(context, ccache, creds);
-        if (ret) {
-                goto done;
-        }
-
         if (out_creds) {
                 *out_creds = creds;

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

@@ -200 +200 @@
         state->buf = (uint8_t *)smb_base(inbuf) + SVAL(vwv+6, 0);
 
-        if (trans_oob(smb_len(inbuf), SVAL(vwv+6, 0), state->received)
+        if (trans_oob(smb_len_large(inbuf), SVAL(vwv+6, 0), state->received)
             || ((state->received != 0) && (state->buf < bytes))) {
                 DEBUG(5, ("server returned invalid read&x data offset\n"));
@@ -945 +945 @@
         }
 
-        size = MIN(size, max_write);
+        state->size = MIN(size, max_write);
 
         vwv = state->vwv;
@@ -957 +957 @@
         SSVAL(vwv+7, 0, mode);
         SSVAL(vwv+8, 0, 0);
-        SSVAL(vwv+9, 0, (size>>16));
-        SSVAL(vwv+10, 0, size);
+        SSVAL(vwv+9, 0, (state->size>>16));
+        SSVAL(vwv+10, 0, state->size);
 
         SSVAL(vwv+11, 0,
@@ -975 +975 @@
         state->iov[0].iov_len = 1;
         state->iov[1].iov_base = CONST_DISCARD(void *, buf);
-        state->iov[1].iov_len = size;
+        state->iov[1].iov_len = state->size;
 
         subreq = cli_smb_req_create(state, ev, cli, SMBwriteX, 0, wct, vwv,
@@ -1027 +1027 @@
         }
         state->written = SVAL(vwv+2, 0);
-        state->written |= SVAL(vwv+4, 0)<<16;
+        if (state->size > UINT16_MAX) {
+                /*
+                 * It is important that we only set the
+                 * high bits only if we asked for a large write.
+                 *
+                 * OS/2 print shares get this wrong and may send
+                 * invalid values.
+                 *
+                 * See bug #5326.
+                 */
+                state->written |= SVAL(vwv+4, 0)<<16;
+        }
         tevent_req_done(req);
 }