← Back to branch summary

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

« back to all changes in this revision

Viewing changes to source4/winbind/wb_sid2gid.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/winbind/wb_sid2gid.c
23
23
#include "libcli/composite/composite.h"
24
24
#include "winbind/wb_server.h"
25
25
#include "smbd/service_task.h"
26
 
#include "winbind/wb_helper.h"
27
26
#include "libcli/security/security.h"
28
 
#include "winbind/idmap.h"
29
27
 
30
28
struct sid2gid_state {
31
29
        struct composite_context *ctx;
40
38
{
41
39
        struct composite_context *result, *ctx;
42
40
        struct sid2gid_state *state;
43
 
        struct id_mapping *ids;
 
41
        struct id_map *ids;
44
42
 
45
43
        DEBUG(5, ("wb_sid2gid_send called\n"));
46
44
 
54
52
        result->private_data = state;
55
53
        state->service = service;
56
54
 
57
 
        ids = talloc(result, struct id_mapping);
 
55
        ids = talloc(result, struct id_map);
58
56
        if (composite_nomem(ids, result)) return result;
59
57
 
60
58
        ids->sid = dom_sid_dup(result, sid);
72
70
        struct sid2gid_state *state = talloc_get_type(ctx->async.private_data,
73
71
                                                      struct sid2gid_state);
74
72
 
75
 
        struct id_mapping *ids = NULL;
 
73
        struct id_map *ids = NULL;
76
74
 
77
75
        state->ctx->status = wb_sids2xids_recv(ctx, &ids);
78
76
        if (!composite_is_ok(state->ctx)) return;
79
77
 
80
 
        if (!NT_STATUS_IS_OK(ids->status)) {
81
 
                composite_error(state->ctx, ids->status);
 
78
        if (ids->status != ID_MAPPED) {
 
79
                composite_error(state->ctx, NT_STATUS_UNSUCCESSFUL);
82
80
                return;
83
81
        }
84
82
 
85
 
        if (ids->unixid->type == ID_TYPE_BOTH ||
86
 
            ids->unixid->type == ID_TYPE_GID) {
87
 
                state->gid = ids->unixid->id;
 
83
        if (ids->xid.type == ID_TYPE_BOTH ||
 
84
            ids->xid.type == ID_TYPE_GID) {
 
85
                state->gid = ids->xid.id;
88
86
                composite_done(state->ctx);
89
87
        } else {
90
88
                composite_error(state->ctx, NT_STATUS_INVALID_SID);