← Back to branch summary

~lefteris-nikoltsios/+junk/samba-lp1016895

« back to all changes in this revision

Viewing changes to source4/libcli/raw/clitransport.c

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2011-12-21 13:18:04 UTC
  • mfrom: (0.39.21 sid)
  • Revision ID: package-import@ubuntu.com-20111221131804-xtlr39wx6njehxxr
Tags: 2:3.6.1-3ubuntu1
* 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/error-trans.fix-276472
    - debian/patches/fix-debuglevel-name-conflict.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
source4/libcli/raw/clitransport.c
75
75
struct smbcli_transport *smbcli_transport_init(struct smbcli_socket *sock,
76
76
                                               TALLOC_CTX *parent_ctx, 
77
77
                                               bool primary, 
78
 
                                               struct smbcli_options *options,
79
 
                                                   struct smb_iconv_convenience *iconv_convenience)
 
78
                                               struct smbcli_options *options)
80
79
{
81
80
        struct smbcli_transport *transport;
82
81
 
91
90
        transport->negotiate.protocol = PROTOCOL_NT1;
92
91
        transport->options = *options;
93
92
        transport->negotiate.max_xmit = transport->options.max_xmit;
94
 
        transport->iconv_convenience = iconv_convenience;
95
93
 
96
94
        /* setup the stream -> packet parser */
97
95
        transport->packet = packet_init(transport);
172
170
        status = nbt_name_dup(transport, called, &transport->called);
173
171
        if (!NT_STATUS_IS_OK(status)) goto failed;
174
172
        
175
 
        status = nbt_name_to_blob(tmp_ctx, transport->iconv_convenience, &calling_blob, calling);
 
173
        status = nbt_name_to_blob(tmp_ctx, &calling_blob, calling);
176
174
        if (!NT_STATUS_IS_OK(status)) goto failed;
177
175
 
178
 
        status = nbt_name_to_blob(tmp_ctx, transport->iconv_convenience, &called_blob, called);
 
176
        status = nbt_name_to_blob(tmp_ctx, &called_blob, called);
179
177
        if (!NT_STATUS_IS_OK(status)) goto failed;
180
178
 
181
179
        /* allocate output buffer */