← Back to branch summary

~ubuntu-branches/ubuntu/intrepid/samba/intrepid-updates

« back to all changes in this revision

Viewing changes to source/libsmb/clireadwrite.c

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2008-06-02 09:01:46 UTC
  • mfrom: (0.25.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20080602090146-92ur4nx39ccg708r
Tags: 2:3.0.30-2ubuntu1
https://launchpad.net/bugs/32067
https://launchpad.net/bugs/201059
https://launchpad.net/bugs/206036
* Merge from debian unstable, remaining changes:
  * debian/patches/VERSION.patch
    - set SAMABA_VERSION_VENDOR_SUFFIX to Ubuntu
  * debian/smb.conf
    - add "(Samba, Ubuntu)" to server string.
    - comment out the default [homes] shares, and a comment about
      "value users = %S to show users how to restrict access to 
      \\server\useranem to only username.
    - Add map to guest = Bad user, maps bad username to guest access.
      (LP: #32067)
  * debian/samba-common.postinst:
    - Fix upgrade from a first installation done with feisty, edgy, or dapper.
      (LP: #201059)
    - When populating the new sambashare group, it's not an error if the user
      simply doesn't exist; test for this case and the install continue 
      instead of aborting. (LP: #206036)
  * debian/smba-common.config:
    - do not change priority to HIGH if dhclient3 is installed
    - used priority medium instead of hight for the workgroup question
  * debian/winbind.files
    - insclude additional files
  * debian/patches/fix-documentation.patch:
    - fix typos in net(8) and smb.conf(5) man pages
  * debian/mksambapasswd.awk:
    - Don't add user with UID less than 1000 to smbpasswd.
  * debian/samba.init:
    - add 'status' option for LSB conformance.
  * Updated control version.
  * Dropped Changes:
    - Dropped debian/patches/fix-smbprinting-os2.patch. Accepted upstream.
    - Dropped debian/patches/fix-documentation.patch. Accepted upstream.
     

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/libsmb/clireadwrite.c
352
352
        }
353
353
 
354
354
        while (received < blocks) {
 
355
                ssize_t size1 = 0;
355
356
 
356
357
                while ((issued - received < mpx) && (issued < blocks)) {
357
358
                        ssize_t bsent = issued * block;
358
 
                        ssize_t size1 = MIN(block, size - bsent);
 
359
 
 
360
                        size1 = MIN(block, size - bsent);
359
361
 
360
362
                        if (!cli_issue_write(cli, fnum, offset + bsent,
361
363
                                        write_mode,
374
376
                        break;
375
377
 
376
378
                bwritten += SVAL(cli->inbuf, smb_vwv2);
377
 
                bwritten += (((int)(SVAL(cli->inbuf, smb_vwv4)))<<16);
 
379
                if (size1 > 0xFFFF) {
 
380
                        bwritten += (((int)(SVAL(cli->inbuf, smb_vwv4)))<<16);
 
381
                }
378
382
        }
379
383
 
380
384
        while (received < issued && cli_receive_smb(cli))