← Back to branch summary

~ubuntu-branches/ubuntu/vivid/samba/vivid

« back to all changes in this revision

Viewing changes to source4/librpc/rpc/dcerpc_auth.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/librpc/rpc/dcerpc_auth.c
114
114
static void bind_auth_next_step(struct composite_context *c)
115
115
{
116
116
        struct bind_auth_state *state;
117
 
        struct dcerpc_security *sec;
 
117
        struct dcecli_security *sec;
118
118
        struct composite_context *creq;
119
119
        bool more_processing = false;
120
120
 
233
233
{
234
234
        struct composite_context *c, *creq;
235
235
        struct bind_auth_state *state;
236
 
        struct dcerpc_security *sec;
 
236
        struct dcecli_security *sec;
237
237
 
238
238
        struct ndr_syntax_id syntax, transfer_syntax;
239
239
 
292
292
                }
293
293
        }
294
294
 
 
295
        if (p->binding && p->binding->target_principal) {
 
296
                c->status = gensec_set_target_principal(sec->generic_state,
 
297
                                                        p->binding->target_principal);
 
298
                if (!NT_STATUS_IS_OK(c->status)) {
 
299
                        DEBUG(1, ("Failed to set GENSEC target principal to %s: %s\n",
 
300
                                  p->binding->target_principal, nt_errstr(c->status)));
 
301
                        composite_error(c, c->status);
 
302
                        return c;
 
303
                }
 
304
        }
 
305
 
295
306
        c->status = gensec_start_mech_by_authtype(sec->generic_state,
296
307
                                                  auth_type, auth_level);
297
308
        if (!NT_STATUS_IS_OK(c->status)) {