← Back to branch summary

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

« back to all changes in this revision

Viewing changes to source3/libsmb/cliconnect.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/libsmb/cliconnect.c
2655
2655
        if (cli->protocol >= PROTOCOL_NT1) {    
2656
2656
                struct timespec ts;
2657
2657
                bool negotiated_smb_signing = false;
 
2658
                DATA_BLOB blob = data_blob_null;
2658
2659
 
2659
2660
                if (wct != 0x11) {
2660
2661
                        tevent_req_nterror(req, NT_STATUS_INVALID_NETWORK_RESPONSE);
2680
2681
                /* work out if they sent us a workgroup */
2681
2682
                if (!(cli->capabilities & CAP_EXTENDED_SECURITY) &&
2682
2683
                    smb_buflen(inbuf) > 8) {
 
2684
                        blob = data_blob_const(bytes + 8, num_bytes - 8);
 
2685
                }
 
2686
 
 
2687
                if (blob.length > 0) {
2683
2688
                        ssize_t ret;
2684
 
                        status = smb_bytes_talloc_string(
2685
 
                                cli, (char *)inbuf, &cli->server_domain,
2686
 
                                bytes + 8, num_bytes - 8, &ret);
2687
 
                        if (tevent_req_nterror(req, status)) {
 
2689
                        char *server_domain = NULL;
 
2690
 
 
2691
                        ret = clistr_pull_talloc(cli,
 
2692
                                                 (const char *)inbuf,
 
2693
                                                 SVAL(inbuf, smb_flg2),
 
2694
                                                 &server_domain,
 
2695
                                                 (char *)blob.data,
 
2696
                                                 blob.length,
 
2697
                                                 STR_TERMINATE|
 
2698
                                                 STR_UNICODE|
 
2699
                                                 STR_NOALIGN);
 
2700
                        if (ret == -1) {
 
2701
                                tevent_req_nterror(req, NT_STATUS_NO_MEMORY);
2688
2702
                                return;
2689
2703
                        }
 
2704
                        if (server_domain) {
 
2705
                                cli->server_domain = server_domain;
 
2706
                        }
2690
2707
                }
2691
2708
 
2692
2709
                /*