← Back to branch summary

~ubuntu-branches/ubuntu/utopic/samba/utopic

« back to all changes in this revision

Viewing changes to source3/smbd/reply.c

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2012-02-21 09:06:34 UTC
  • mfrom: (0.39.23 sid)
  • Revision ID: package-import@ubuntu.com-20120221090634-svd7q7m33pfz0847
Tags: 2:3.6.3-1ubuntu1
* Merge from Debian testing.  Remaining changes:
  + debian/patches/VERSION.patch:
    - set SAMBA_VERSION_SUFFIX to Ubuntu.
  + debian/patches/error-trans.fix-276472:
    - Add the translation of Unix Error code -ENOTSUP to NT Error Code
    - NT_STATUS_NOT_SUPPORTED to prevent the Permission denied error.
  + debian/smb.conf:
    - add "(Samba, Ubuntu)" to server string.
    - comment out the default [homes] share, and add a comment about
      "valid users = %S" to show users how to restrict access to
      \\server\username to only username.
    - Set 'usershare allow guests', so that usershare admins are 
      allowed to create public shares in addition to authenticated
      ones.
    - add map to guest = Bad user, maps bad username to guest access.
  + debian/samba-common.config:
    - Do not change priority to high if dhclient3 is installed.
    - Use priority medium instead of high for the workgroup question.
  + debian/control:
    - Don't build against or suggest ctdb.
    - Add dependency on samba-common-bin to samba.
  + Add ufw integration:
    - Created debian/samba.ufw.profile
    - debian/rules, debian/samba.dirs, debian/samba.files: install
      profile
    - debian/control: have samba suggest ufw
  + Add apport hook:
    - Created debian/source_samba.py.
    - debian/rules, debian/samba.dirs, debian/samba-common-bin.files: install
  + Switch to upstart:
    - Add debian/samba.{nmbd,smbd}.upstart.
  + debian/samba.logrotate, debian/samba-common.dhcp, debian/samba.if-up:
    - Make them upstart compatible
  + debian/samba.postinst: 
    - Avoid scary pdbedit warnings on first import.
  + debian/samba-common.postinst: Add more informative error message for
    the case where smb.conf was manually deleted
  + debian/patches/fix-debuglevel-name-conflict.patch: don't use 'debug_level'
    as a global variable name in an NSS module.
* Dropped:
  - debian/patches/fix-samba-printer-browsing.patch: No longer needed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
source3/smbd/reply.c
4630
4630
        SSVAL(req->outbuf,smb_vwv2,nwritten);
4631
4631
        SSVAL(req->outbuf,smb_vwv4,nwritten>>16);
4632
4632
 
4633
 
        if (nwritten < (ssize_t)numtowrite) {
4634
 
                SCVAL(req->outbuf,smb_rcls,ERRHRD);
4635
 
                SSVAL(req->outbuf,smb_err,ERRdiskfull);
4636
 
        }
4637
 
 
4638
4633
        DEBUG(3,("writeX fnum=%d num=%d wrote=%d\n",
4639
4634
                fsp->fnum, (int)numtowrite, (int)nwritten));
4640
4635
 
6608
6603
        TALLOC_CTX *ctx = talloc_tos();
6609
6604
        struct smb_filename *smb_fname_src = NULL;
6610
6605
        struct smb_filename *smb_fname_dst = NULL;
 
6606
        uint32_t src_ucf_flags = lp_posix_pathnames() ? UCF_UNIX_NAME_LOOKUP : UCF_COND_ALLOW_WCARD_LCOMP;
 
6607
        uint32_t dst_ucf_flags = UCF_SAVE_LCOMP | (lp_posix_pathnames() ? 0 : UCF_COND_ALLOW_WCARD_LCOMP);
6611
6608
        bool stream_rename = false;
6612
6609
 
6613
6610
        START_PROFILE(SMBmv);
6650
6647
                                  conn,
6651
6648
                                  req->flags2 & FLAGS2_DFS_PATHNAMES,
6652
6649
                                  name,
6653
 
                                  UCF_COND_ALLOW_WCARD_LCOMP,
 
6650
                                  src_ucf_flags,
6654
6651
                                  &src_has_wcard,
6655
6652
                                  &smb_fname_src);
6656
6653
 
6668
6665
                                  conn,
6669
6666
                                  req->flags2 & FLAGS2_DFS_PATHNAMES,
6670
6667
                                  newname,
6671
 
                                  UCF_COND_ALLOW_WCARD_LCOMP | UCF_SAVE_LCOMP,
 
6668
                                  dst_ucf_flags,
6672
6669
                                  &dest_has_wcard,
6673
6670
                                  &smb_fname_dst);
6674
6671